From patchwork Wed Feb 14 13:29:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 128337 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp611261ljc; Wed, 14 Feb 2018 05:31:12 -0800 (PST) X-Google-Smtp-Source: AH8x224jW1eGUbJEkUqOuYYkN+PC9XDiZrP/0riG2QAIEIfal3eCa6Z4EJ3ToK/Q97eYlItZT1mL X-Received: by 10.223.167.137 with SMTP id j9mr955663wrc.267.1518615072896; Wed, 14 Feb 2018 05:31:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518615072; cv=none; d=google.com; s=arc-20160816; b=BrDHwuESFg9yWew80xbqCDYEmb+gu0IZTRMPk9y1QibL5GG9xkebrPwibmHkWpbXDR LhHvvaMaRoS0U4KMdEMFCU9QD3pq545xY+i1gaazP9PxnGtrFo6A8Zs/13u/RVghOReh 65JJI6MAULEte3T+ARiTW8h282Yon1w8O92HBt19OZ7BGQph8w7Ab6aIfpUeOxMRnubu Mm/i3j3WHOr8LP0jGPUGJUrtP6e/M5qzdMEjjBXZ4z2gFi2o9MUoqah9EYS+UXrisOV3 OzoIYwiXpWLBABhikBnoNcdVpBplzrdRUmzngfBNK/QIe6Sh+Yiqsym0D/3JMKpapLTw XmmQ== 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=vmYsU3e2pReYj0buI1gdEvXY+6aDiQuxQEG2aNnOB4o=; b=JJ4JYQzZ2LdV7KzyPtAL4uKoKK3TUJpDsNbkCDIILRtg9/GubIRDBmSakwdRwdubrD rJpZcnjUjtu7VpoU+3g9wU0NphQMllAsz1EfYT2jhScGwdI96/5H1FYbyWkgkt7a8FRJ XGFtjrr2aOceAev0crUsYj3fO4HwO6LgIA8AkokxFJvHLus1yk0y1NySGbiuMF2t1RtN i8J8E5gA2BbHmSIRTmVWtH/Fb4IvJW7uG7McWyWTa11JsKb+Zf2BgTIK1LVUt+DJKIOO NLm/LMxDL1oVaGvytuwVftHEmeJ+AVyGdBv+Bz4OrsAQRxZi7excLH0l4t5AgIUB5oZR LhVg== 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=nODAxipk; 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 f206si2533975wmf.2.2018.02.14.05.31.12; Wed, 14 Feb 2018 05:31:12 -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=nODAxipk; 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 D14F8267B11; Wed, 14 Feb 2018 14:30:21 +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 4E70E267B96; Wed, 14 Feb 2018 14:30:20 +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 55E27267B15 for ; Wed, 14 Feb 2018 14:29:31 +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=LXGGv+LfaTOyC4Ie5MuXoWCnzcJPRHd9MaYJ97UL0ts=; b=nODAxipkhLhd dznf34g9jEyry5kNsNoG50s1Xr3/PqUhg4izLUIvH/6EhLx0kYggXrxvm91OvInayd1JKimfVKY/r 8jFKhCnsnaTvagR+CtSx+gKYMDoBMpyHbX4avwiIeGKYBic3/WYCWtaPS3ZPMsSsKZPK0Yo6X1lmg sIQ50=; 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 1elx7p-0004q5-HM; Wed, 14 Feb 2018 13:29:29 +0000 Received: from broonie by debutante with local (Exim 4.90_1) (envelope-from ) id 1elx7p-00074W-32; Wed, 14 Feb 2018 13:29:29 +0000 From: Mark Brown To: Kuninori Morimoto In-Reply-To: <87sha4b7ow.wl%kuninori.morimoto.gx@renesas.com> Message-Id: Date: Wed, 14 Feb 2018 13:29:29 +0000 Cc: alsa-devel@alsa-project.org, Mark Brown Subject: [alsa-devel] Applied "ASoC: soc-core: soc_probe_dai() code simplification" 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: soc-core: soc_probe_dai() code simplification 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 7a2ccad58106696b7909815cc7ab359ae2743bcc Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Wed, 14 Feb 2018 02:58:03 +0000 Subject: [PATCH] ASoC: soc-core: soc_probe_dai() code simplification Current soc_probe_dai() is using deep nested condition. Thus, it is difficult to read/understand. This patch simplification it. Signed-off-by: Kuninori Morimoto Signed-off-by: Mark Brown --- sound/soc/soc-core.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) -- 2.16.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-core.c b/sound/soc/soc-core.c index 60a542f35dbd..574048a73b1c 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1624,22 +1624,21 @@ static int soc_probe_link_components(struct snd_soc_card *card, static int soc_probe_dai(struct snd_soc_dai *dai, int order) { - int ret; + if (dai->probed || + dai->driver->probe_order != order) + return 0; - if (!dai->probed && dai->driver->probe_order == order) { - if (dai->driver->probe) { - ret = dai->driver->probe(dai); - if (ret < 0) { - dev_err(dai->dev, - "ASoC: failed to probe DAI %s: %d\n", - dai->name, ret); - return ret; - } + if (dai->driver->probe) { + int ret = dai->driver->probe(dai); + if (ret < 0) { + dev_err(dai->dev, "ASoC: failed to probe DAI %s: %d\n", + dai->name, ret); + return ret; } - - dai->probed = 1; } + dai->probed = 1; + return 0; }