From patchwork Thu Mar 1 18:07:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 130369 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp3114059edc; Thu, 1 Mar 2018 10:08:47 -0800 (PST) X-Google-Smtp-Source: AG47ELuTZgc49Yzh/2ZcRcT/bbijZoi9evLeDuAd2JDStXhZ4eLnx2kbONYZ6/3fgvZFjLj5yLMw X-Received: by 10.223.176.228 with SMTP id j33mr2476352wra.67.1519927727703; Thu, 01 Mar 2018 10:08:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519927727; cv=none; d=google.com; s=arc-20160816; b=oe8/QCgu+huNEPv5xNKsCF8saY1neUblKQiEEOwYbRqsg1hBCWQtgg96s7Ue3Y0co9 UAdUxmH8l2/9r6SLSmXluB1JVsyptmykWFlYThesKCvZX13IMvP39dvB2ntZdMAZhTx6 fO1t5+jDVYY+vvP/VPJBUaUZIHZ5awQANhwfTECSISB4pWPAd+ps6aWCJMWMC/J2Cd8G pn1tITayN4fepsTiNb9L4Aq4dCVayJZTeHucWEUdXLsUlJEj5vXxGJjha4wxDS8eKEQ1 p0Hopf4QVUyRR/RCLr45/JCbr3v7JkzG3hpGYpqmhaZTD1AA2HtdM7VMlxnaz4sxmxiM PfJw== 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=1VZa4BJW61nSbADjMUPdzSPUMIZVeafC+CGmhpbWpY8=; b=00TPf6xQbbyjg7fTKG1QRM/o3gf9JIIascKxkAl6pVpFYoe8uWSLT9u7dTOM47CRYV W28IUd0GP3ZYrmBunXCpK8m/tjk1VntadhDBCt/I0HvFWFKq21NaJz4wvHgHIqnHe+Jp fMR+j/UMGh1st6PBDq9iRB/AxD+i7bXroVeJAlPs0El2xiquVwNotf2b4v49NtBhVKWI WU0Ukyd2t2USztWBrnVDfcDva15/RgH+lsy/w5eZPsG8yBE5ntTwUYNBpme3FTBD7J+o t/cPwkkssSGxXHOv4fLUOr5HyMonDrCaDqhIRoEEL+H4KHX9AqH7suJsoU7yAs9smKzt /l6Q== 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=oYFVRsiF; 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 1si2282378wmj.43.2018.03.01.10.08.47; Thu, 01 Mar 2018 10:08:47 -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=oYFVRsiF; 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 D2A47267B7A; Thu, 1 Mar 2018 19:07:26 +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 7460B267B5D; Thu, 1 Mar 2018 19:07:19 +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 685C4267B5D for ; Thu, 1 Mar 2018 19:07:16 +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=fXe/aNwLItJh3OM255Y8AKI6PhbLTrGWu3r1Sea+uqA=; b=oYFVRsiFlTrb /1lAn8m4YIY/PfYQ20aDYf8bHCCQOZ7g/HsMVCWIzvB3YLHPhnQjEj1WhX6cVlpEtQfgE5TQV75NQ 6WFppsdxF9DPNesibN1IkwUUtJbpXLcFjcGVm6cfdbQKNy+figNwVDhhA4fopK0Y1wa0R9XwhC50/ WieLo=; 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 1erSbq-0005XV-LP; Thu, 01 Mar 2018 18:07:14 +0000 Received: from broonie by debutante with local (Exim 4.90_1) (envelope-from ) id 1erSbq-0005xL-7s; Thu, 01 Mar 2018 18:07:14 +0000 From: Mark Brown To: Hans de Goede In-Reply-To: Message-Id: Date: Thu, 01 Mar 2018 18:07:14 +0000 Cc: alsa-devel@alsa-project.org, Mark Brown Subject: [alsa-devel] Applied "ASoC: Intel: sst: Remove unused STREAM_DECODE and STREAM_RESET states" 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 unused STREAM_DECODE and STREAM_RESET states 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 de9833476de7eb1d4b8bdc599cbbd616fb0e1a28 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 18 Feb 2018 23:01:41 +0100 Subject: [PATCH] ASoC: Intel: sst: Remove unused STREAM_DECODE and STREAM_RESET states STREAM_DECODE is completely unused, status == STREAM_RESET was checked for, but never set, remove both. Signed-off-by: Hans de Goede Signed-off-by: Mark Brown --- sound/soc/intel/atom/sst/sst.h | 4 +--- sound/soc/intel/atom/sst/sst_drv_interface.c | 19 ------------------- 2 files changed, 1 insertion(+), 22 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 164b0f674c20..f4fd442080b2 100644 --- a/sound/soc/intel/atom/sst/sst.h +++ b/sound/soc/intel/atom/sst/sst.h @@ -65,9 +65,7 @@ enum sst_stream_states { STREAM_UN_INIT = 0, /* Freed/Not used stream */ STREAM_RUNNING = 1, /* Running */ STREAM_PAUSED = 2, /* Paused stream */ - STREAM_DECODE = 3, /* stream is in decoding only state */ - STREAM_INIT = 4, /* stream init, waiting for data */ - STREAM_RESET = 5, /* force reset on recovery */ + STREAM_INIT = 3, /* stream init, waiting for data */ }; enum sst_ram_type { diff --git a/sound/soc/intel/atom/sst/sst_drv_interface.c b/sound/soc/intel/atom/sst/sst_drv_interface.c index 71af5449be90..6a8b253c58d2 100644 --- a/sound/soc/intel/atom/sst/sst_drv_interface.c +++ b/sound/soc/intel/atom/sst/sst_drv_interface.c @@ -238,16 +238,7 @@ static int sst_cdev_close(struct device *dev, unsigned int str_id) return -EINVAL; } - if (stream->status == STREAM_RESET) { - dev_dbg(dev, "stream in reset state...\n"); - stream->status = STREAM_UN_INIT; - - retval = 0; - goto put; - } - retval = sst_free_stream(ctx, str_id); -put: stream->compr_cb_param = NULL; stream->compr_cb = NULL; @@ -256,7 +247,6 @@ static int sst_cdev_close(struct device *dev, unsigned int str_id) dev_dbg(dev, "End\n"); return retval; - } static int sst_cdev_ack(struct device *dev, unsigned int str_id, @@ -486,16 +476,7 @@ static int sst_close_pcm_stream(struct device *dev, unsigned int str_id) return -EINVAL; } - if (stream->status == STREAM_RESET) { - /* silently fail here as we have cleaned the stream earlier */ - dev_dbg(ctx->dev, "stream in reset state...\n"); - - retval = 0; - goto put; - } - retval = free_stream_context(ctx, str_id); -put: stream->pcm_substream = NULL; stream->status = STREAM_UN_INIT; stream->period_elapsed = NULL;