From patchwork Fri Jan 26 15:25:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 125995 Delivered-To: patch@linaro.org Received: by 10.46.84.92 with SMTP id y28csp411649ljd; Fri, 26 Jan 2018 07:25:59 -0800 (PST) X-Google-Smtp-Source: AH8x22737YPT+OdNkNwgaB+DcG1hcSrk4k3SxS4iHq5AxcnSoZRj3qxjAgPN2gC4vL8wcR21a5Th X-Received: by 10.223.176.109 with SMTP id g42mr91468wra.129.1516980359477; Fri, 26 Jan 2018 07:25:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516980359; cv=none; d=google.com; s=arc-20160816; b=dGE675MYxwFzTMW7uA737m3vfK9o7m22G7vISIuXwcDNVWCNCe55dd4y/6avXcQrTT u8xKQcRekwB5H/BbTl6qPy2j4dH9DhZk5hTQElOMgSyFjaVFG+NpKFOp6WLTPCKF+VAp bKlIKChZlnO/DKxYYmYDWfQtj1Mg/hShgOhQtH2PP6qfYbNgTHkfkUOsFzW7fEymRgtK wc94kcZy0sqA7g1ZCeVCTE2d/Tb/GdBOLLCj54PkOxnKKGqW20HKGboWw5XhCWMMEacU i0sDxD6Ufun9rwXOKZU/QmObm5DPBbSOVo4Yho/2VHVx/bLQY0n0ez/RIaRvFeTuYbhj J19w== 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=5O3FJgAX6CoP8TkjFCQHyezv1NwufMlH5T1E397kcM0=; b=S/MoLPivtnNePjATNhXxbKAthWEH870U4V5HXjMaw9PGVth44/T+TFoDJdQMvVkrZC /yKzIi4drU7CGsji/JYK0tgrK7390EW0xgDBHxBg39i/4CewK9h15zVlGsnGmlBBWifa y6sOss41IgvPu6i3Nqh+ujeFs3xVUwpbSRj78ihtqp8PGZQN1RBhLJEfGx+OzWPg1vd7 hZtUvcNNW9/Q/lNiIy0VaMgdZdScckCNQwLGZOWy+YzqIh7qHarHBTSCzIqkYgyIMsMy QNtCMs/JM5me98tFR/EuR0ByB+D/veXVOMzRZZ8CxwH2Sc04coN5aivWwPPGo9jKyrE9 XxcQ== 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=V/OBCg6l; 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 31si5655060wrr.94.2018.01.26.07.25.59; Fri, 26 Jan 2018 07:25:59 -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=V/OBCg6l; 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 5432826769C; Fri, 26 Jan 2018 16:25:58 +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 2177626769E; Fri, 26 Jan 2018 16:25:57 +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.0 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 3D13026721A for ; Fri, 26 Jan 2018 16:25:53 +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=BV+rkPCX80P374utX4a0N2wVbMn0V2/Aw1EFwCeawoo=; b=V/OBCg6llKG4 JmZCmL6miPZ9h40wuSc78lzEnqqdLd8OS9WktJfYYLqSLNqM7EsjqdCCIztJOsbX3prSZdsxOC4uk TX3aO/PqwyjlRkeL17IB+EWLJzMhA2tiKiG4FO0wrPEXzn7T12a5STtpEpWYTozUg9gOyRe6fVg0y 5EgFA=; 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 1ef5sw-0007DW-8j; Fri, 26 Jan 2018 15:25:46 +0000 Received: from broonie by debutante with local (Exim 4.90) (envelope-from ) id 1ef5sv-0006YX-Qz; Fri, 26 Jan 2018 15:25:45 +0000 From: Mark Brown To: Charles Keepax In-Reply-To: <20180126130845.7122-2-ckeepax@opensource.cirrus.com> Message-Id: Date: Fri, 26 Jan 2018 15:25:45 +0000 Cc: alsa-devel@alsa-project.org, ladis@linux-mips.org, kuninori.morimoto.gx@renesas.com, vinod.koul@intel.com, lgirdwood@gmail.com, broonie@kernel.org, dan.carpenter@oracle.com Subject: [alsa-devel] Applied "ASoC: compress: Remove some extraneous blank lines" 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: compress: Remove some extraneous blank lines 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 b2154d729edad549842cdbaae4beda18dbb425ff Mon Sep 17 00:00:00 2001 From: Charles Keepax Date: Fri, 26 Jan 2018 13:08:44 +0000 Subject: [PATCH] ASoC: compress: Remove some extraneous blank lines Signed-off-by: Charles Keepax Signed-off-by: Mark Brown --- sound/soc/soc-compress.c | 3 --- 1 file changed, 3 deletions(-) -- 2.15.1 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c index 7973f92cd40f..b1cf758e3be2 100644 --- a/sound/soc/soc-compress.c +++ b/sound/soc/soc-compress.c @@ -145,7 +145,6 @@ static int soc_compr_open_fe(struct snd_compr_stream *cstream) } } - if (platform && platform->driver->compr_ops && platform->driver->compr_ops->open) { ret = platform->driver->compr_ops->open(cstream); if (ret < 0) { @@ -307,7 +306,6 @@ static int soc_compr_free(struct snd_compr_stream *cstream) if (!codec_dai->active) codec_dai->rate = 0; - if (rtd->dai_link->compr_ops && rtd->dai_link->compr_ops->shutdown) rtd->dai_link->compr_ops->shutdown(cstream); @@ -460,7 +458,6 @@ static int soc_compr_trigger(struct snd_compr_stream *cstream, int cmd) if (cpu_dai->driver->cops && cpu_dai->driver->cops->trigger) cpu_dai->driver->cops->trigger(cstream, cmd, cpu_dai); - switch (cmd) { case SNDRV_PCM_TRIGGER_START: snd_soc_dai_digital_mute(codec_dai, 0, cstream->direction);