From patchwork Thu Mar 1 18:07:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 130371 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp3114340edc; Thu, 1 Mar 2018 10:09:06 -0800 (PST) X-Google-Smtp-Source: AG47ELu7AZkejHQA0XphU6G65lYkqCrWYZhhdLqXMfSfqIX12zJOP1J7cfQ6j+HpW9JJixXfwv30 X-Received: by 10.223.179.194 with SMTP id x2mr2783349wrd.94.1519927745992; Thu, 01 Mar 2018 10:09:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519927745; cv=none; d=google.com; s=arc-20160816; b=Y4cewGMt1XWIpWLKdq3ErOnexZisN41pw5eZpxCNe83BdKB76Pgdx/XE8tAxwIsff8 tMyAjQUNmsbJ1pI15mquVWqHJrakA3cUNF7U6t001+OBKmDSZZ8RgFK9eoRbGakXgz45 z5nHOkBCP6CCAxHaBWsMWVd84Zt4maDfChVlXzSduC/UP4O3v1rtKaDk7Oh51ukgRXwh 8BEVDnL6QFsHKsDqvE4drL7EthGjn3bGkpsOd8TH99P+d1vSmciLsKKY64qBCzos3KoN lh1xXahWvw+NGUds/bz74WAobAaMdz4BBjkAS1Jcbv6Wzk/NWJJoeyX/GMhQdqLBjP97 OX1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:date:message-id:in-reply-to:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=oKpIATLooSXJImIlimd+DcfD9dsjt2dk0nN9LLldbB8=; b=WgFSJ2xQci1O9692fCRsXdmHM1GUdZr1myn9KxEdaSws/TLPz9vt08+oybsrhDSN+m XlP47r/rEip19HupK6r/+m7LE40k6KrkHjRphGVcF0V7N8K/b6g3z3hat0ZzHyA4EHjK BYI7tIIZoMH+UNPus+5U9DdAXxFS8IEnovzZbKLFyaGlB7Vogg37kxZEB7T0/nawD+Di J5pu3YMod/omWLs8ZyczYvG16Hj0ITq+cfvXiYoTjg+CryaB2DSKgG3CuF/KxwRFI2tc z2BzMQ0xTJrHRhhL9Ug1AQMLQTQnh+Gs2aWXM3kg2ujYqF33BlOZnruqq0dhiRoVqidv qfwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=k2pMd5G6; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id a5si3242823wrf.227.2018.03.01.10.09.05; Thu, 01 Mar 2018 10:09:05 -0800 (PST) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=k2pMd5G6; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 82C13267B84; Thu, 1 Mar 2018 19:07:29 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 29C8B267B6E; Thu, 1 Mar 2018 19:07:23 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, SPF_PASS, T_RP_MATCHES_RCVD autolearn=disabled version=3.4.0 Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [172.104.155.198]) by alsa0.perex.cz (Postfix) with ESMTP id DCB59267B33 for ; Thu, 1 Mar 2018 19:07:20 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=s1CcyO8bs0TQPPwlePShoH3N4XvIHCL5WelRZXAicOk=; b=k2pMd5G6R1eu /QlQPhWy2hSi2gzqpKUVev5RbjN9eYt+GmgFg/CQWvD+ivvr3vC6/bFyvA5VqrGO/zt0nsA34rcIw GOdW9kt2IvOC2oPGRr/BpiV1rSvzTpz5abfsdwgAU2uoLT/RZTwVq1PHWTr4sMG/bFPKLHlSbh0ot G1mMw=; Received: from debutante.sirena.org.uk ([2001:470:1f1d:6b5::3] helo=debutante) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1erSbv-0005Xh-5Z; Thu, 01 Mar 2018 18:07:19 +0000 Received: from broonie by debutante with local (Exim 4.90_1) (envelope-from ) id 1erSbu-0005yp-NX; Thu, 01 Mar 2018 18:07:18 +0000 From: Mark Brown To: Hans de Goede In-Reply-To: Message-Id: Date: Thu, 01 Mar 2018 18:07:18 +0000 Cc: alsa-devel@alsa-project.org, Mark Brown Subject: [alsa-devel] Applied "ASoC: Intel: sst: Remove 2 unused members from stream_info struct" to the asoc tree X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org The patch ASoC: Intel: sst: Remove 2 unused members from stream_info struct has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From bd47469c9985b50831a55bdda5a36f4672452764 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 18 Feb 2018 23:01:39 +0100 Subject: [PATCH] ASoC: Intel: sst: Remove 2 unused members from stream_info struct Remove the unused ops and str_id members from the stream_info struct. While at it also remove some kernel-doc comments for members which have already been removed in the past. Signed-off-by: Hans de Goede Signed-off-by: Mark Brown --- sound/soc/intel/atom/sst/sst.h | 7 ------- sound/soc/intel/atom/sst/sst_pvt.c | 1 - 2 files changed, 8 deletions(-) -- 2.16.2 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/intel/atom/sst/sst.h b/sound/soc/intel/atom/sst/sst.h index e02e2b4cc08f..1f3107909044 100644 --- a/sound/soc/intel/atom/sst/sst.h +++ b/sound/soc/intel/atom/sst/sst.h @@ -181,21 +181,15 @@ struct sst_block { * * @status : stream current state * @prev : stream prev state - * @ops : stream operation pb/cp/drm... - * @bufs: stream buffer list * @lock : stream mutex for protecting state * @pcm_substream : PCM substream * @period_elapsed : PCM period elapsed callback * @sfreq : stream sampling freq - * @str_type : stream type * @cumm_bytes : cummulative bytes decoded - * @str_type : stream type - * @src : stream source */ struct stream_info { unsigned int status; unsigned int prev; - unsigned int ops; struct mutex lock; void *pcm_substream; @@ -212,7 +206,6 @@ struct stream_info { unsigned int num_ch; unsigned int pipe_id; - unsigned int str_id; unsigned int task_id; }; diff --git a/sound/soc/intel/atom/sst/sst_pvt.c b/sound/soc/intel/atom/sst/sst_pvt.c index b1e6b8f34a6a..d7d38b0f68db 100644 --- a/sound/soc/intel/atom/sst/sst_pvt.c +++ b/sound/soc/intel/atom/sst/sst_pvt.c @@ -365,7 +365,6 @@ void sst_init_stream(struct stream_info *stream, { stream->status = STREAM_INIT; stream->prev = STREAM_UN_INIT; - stream->ops = ops; } int sst_validate_strid(