From patchwork Thu Feb 15 15:34:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 10221919 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3CE8F601D7 for ; Thu, 15 Feb 2018 15:40:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2C01529448 for ; Thu, 15 Feb 2018 15:40:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2036829452; Thu, 15 Feb 2018 15:40:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 90A7C29444 for ; Thu, 15 Feb 2018 15:40:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Date:Message-Id: In-Reply-To:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: References:List-Owner; bh=U3z+wzc6boL0Y9UXY6gktDeYLK9lPmZLYf3Hdvikrbo=; b=gRX 8RZzvEFTS3b344zq1+CWGbB2FQ/WB5j98rACMcTzqFD26K2r4C401OSfagpzWJdN+BY62XgGKDJ02 2h674fhLbhT4rZh16dbsrHknGrcTWhoQhvH02jZIo4TRzqyK+9v9iRQRruhEequsWAfIRM2vylIBi 01aE+kG1kxaLDeSP7OWEY9vzO0Sm8mD9A9TE9D6EWgLlSeRbxZSB2LdvHW2yesoMxlyw+KcwaZL1p z4vkvDyVOgx5PCWh2FbtoWGj58j05bb11WgAzYZNxPnUfr4WjlA1Ysdpvmx4PduFwmUuuaWxaGBRZ ui2FPFLJtKZMXsqomTPMvCHrxYdMnVQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1emLeA-00034P-3F; Thu, 15 Feb 2018 15:40:30 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1emLZZ-00079w-1a for linux-arm-kernel@bombadil.infradead.org; Thu, 15 Feb 2018 15:35:45 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; 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=eaERXG7h6yM4PCN/ZucpabTjDx3rjEwstgaY4eLNiO0=; b=ZYzOpLb64sTDicuXX7ssDKE04x UUiBaOd+IIuMTcoZgnbHyIzbScTXvWYfcuvaz63n8dyzkQ0ytO3DGGsKaoCYUUB+BoVWZwoZkgo3V 3yL9X6Cjyj5mLhU58y+uJA4cccmqHwgPfUhXR6jY3xSpFKtXr92FFNsjiUQqvuyaYetC/QmOJzCnZ guQPyMI7wh1LISmJXQsIGNuMC9D9kVHSeEOK8mHH4FiJPN+Yqa2yjP8ubvcsozAJBTIMKJBvvtMu3 2VMCBCFtVHZ/r6DJOrU4/M6l4BSMxFZeA3VG54eFuiUwBhCvcCJIJ9v35vbg6ucRUZweiyRkxF+bf 5M+0TuWQ==; Received: from heliosphere.sirena.org.uk ([2a01:7e01::f03c:91ff:fed4:a3b6]) by merlin.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1emLZV-00042S-UH for linux-arm-kernel@lists.infradead.org; Thu, 15 Feb 2018 15:35:43 +0000 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=eaERXG7h6yM4PCN/ZucpabTjDx3rjEwstgaY4eLNiO0=; b=JATAqVR9QVcD K8q/H1krnCQQtSMxjAJsgvEHfcTiXwOyhUZlek8GSPh2AGgcTJZNaTVGnUMeNlME8XgWVD0C0h4eh pkKbzm3PlW4LVJMKufo4i2tyT+7F6QnXu2yxs30Z29yPsQTI4TGLb/cQfrFQGkK6LjDo31rqsEd+w 61rVY=; 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 1emLY8-0002Bv-5y; Thu, 15 Feb 2018 15:34:16 +0000 Received: from broonie by debutante with local (Exim 4.90_1) (envelope-from ) id 1emLY7-0007KZ-Mh; Thu, 15 Feb 2018 15:34:15 +0000 From: Mark Brown To: Colin Ian King Subject: Applied "ASoC: uniphier: remove redundant check of blk_id" to the asoc tree In-Reply-To: <20180214161036.32446-1-colin.king@canonical.com> Message-Id: Date: Thu, 15 Feb 2018 15:34:15 +0000 X-Bad-Reply: In-Reply-To but no 'Re:' in Subject. X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180215_103542_092652_34A17840 X-CRM114-Status: GOOD ( 13.85 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Takashi Iwai , Liam Girdwood , Katsuhiro Suzuki , Masahiro Yamada , Mark Brown , Jaroslav Kysela , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The patch ASoC: uniphier: remove redundant check of blk_id 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 53b8e4504aaa7fc88fd18e6caac3a4d4367bd4a4 Mon Sep 17 00:00:00 2001 From: Colin Ian King Date: Wed, 14 Feb 2018 16:10:36 +0000 Subject: [PATCH] ASoC: uniphier: remove redundant check of blk_id The check of blk_id == AUD_CLK_IO is redundant as it also being performed in the following switch statement with the same return of -ENOTSUPP. Fix this by removing the redundant comparison. Detected by CoverityScan, CID#1465227 ("Logically dead code") Signed-off-by: Colin Ian King Signed-off-by: Mark Brown --- sound/soc/uniphier/aio-cpu.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sound/soc/uniphier/aio-cpu.c b/sound/soc/uniphier/aio-cpu.c index 55f3248a31fd..7cf2316c69a2 100644 --- a/sound/soc/uniphier/aio-cpu.c +++ b/sound/soc/uniphier/aio-cpu.c @@ -134,9 +134,6 @@ static int uniphier_aio_set_sysclk(struct snd_soc_dai *dai, int clk_id, bool pll_auto = false; int pll_id, div_id; - if (clk_id == AUD_CLK_IO) - return -ENOTSUPP; - switch (clk_id) { case AUD_CLK_IO: return -ENOTSUPP;