From patchwork Tue Nov 6 17:53:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 10671183 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5F68113A4 for ; Tue, 6 Nov 2018 17:53:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 54BF0286D3 for ; Tue, 6 Nov 2018 17:53:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 47DEB2A206; Tue, 6 Nov 2018 17:53:49 +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=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8DA9E286D3 for ; Tue, 6 Nov 2018 17:53:48 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 70E81267AAB; Tue, 6 Nov 2018 18:53:47 +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 C87D3267AAB; Tue, 6 Nov 2018 18:53:44 +0100 (CET) Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [172.104.155.198]) by alsa0.perex.cz (Postfix) with ESMTP id 5184C267AB0 for ; Tue, 6 Nov 2018 18:53:41 +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=CXn3ha+mA+zA9+HJgI2/Z3ziKNSaKYDkX9NZCvWvr04=; b=hGuzhLtTVTGm 1nOGEtly8Tu18M6j3hWKTOAI7cEmlqTm8eAm7i4aL1Z/8GNlwrnvZLSugZnJ7KNdV6zXZbnPORv5N hsB3gV1N7zCWj4+v2dMNwgjgGYjJAk453dVCWv7dy/p75/TJo4kvcvzhAffwakE05buHqlVjbMTPk IayGU=; Received: from cpc102320-sgyl38-2-0-cust46.18-2.cable.virginm.net ([82.37.168.47] helo=debutante.sirena.org.uk) by heliosphere.sirena.org.uk with esmtpa (Exim 4.89) (envelope-from ) id 1gK5Xo-0002rh-SD; Tue, 06 Nov 2018 17:53:40 +0000 Received: by debutante.sirena.org.uk (Postfix, from userid 1000) id 94EDA112266B; Tue, 6 Nov 2018 17:53:40 +0000 (GMT) From: Mark Brown To: Kuninori Morimoto In-Reply-To: <87h8gux221.wl-kuninori.morimoto.gx@renesas.com> Message-Id: <20181106175340.94EDA112266B@debutante.sirena.org.uk> Date: Tue, 6 Nov 2018 17:53:40 +0000 (GMT) Cc: alsa-devel@alsa-project.org, Mark Brown Subject: [alsa-devel] Applied "ASoC: audio-graph-scu-card: remove error check which never happen" 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 X-Virus-Scanned: ClamAV using ClamSMTP The patch ASoC: audio-graph-scu-card: remove error check which never happen 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 5049a6e7316cdbf4370d5479e9628d8f5e906635 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Tue, 6 Nov 2018 04:36:55 +0000 Subject: [PATCH] ASoC: audio-graph-scu-card: remove error check which never happen Current driver is checking situation that can not happen. This patch removes over-kill check Signed-off-by: Kuninori Morimoto Signed-off-by: Mark Brown --- sound/soc/generic/audio-graph-scu-card.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/sound/soc/generic/audio-graph-scu-card.c b/sound/soc/generic/audio-graph-scu-card.c index ba7b0cf028b7..2ba35bdd3b38 100644 --- a/sound/soc/generic/audio-graph-scu-card.c +++ b/sound/soc/generic/audio-graph-scu-card.c @@ -250,9 +250,6 @@ static int asoc_graph_card_parse_of(struct graph_card_data *priv) of_node_put(codec_port); if (codec) { - if (!codec_port) - continue; - if (codec_port_old == codec_port) continue; @@ -308,11 +305,7 @@ static int asoc_graph_get_dais_count(struct device *dev) of_node_put(codec_ep); of_node_put(codec_port); - if (cpu_ep) - count++; - - if (!codec_port) - continue; + count++; if (codec_port_old == codec_port) continue;