From patchwork Mon Jun 18 12:00:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 138900 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp3865315lji; Mon, 18 Jun 2018 05:01:11 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIggSJIO1/uxJdZtOgQUp2q8KjiZgGOZ10JfD7KjMsDM3c+uu+hX6vrvtBKjId6Ehr1hWDz X-Received: by 2002:adf:a4cf:: with SMTP id h15-v6mr10538665wrb.130.1529323271779; Mon, 18 Jun 2018 05:01:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529323271; cv=none; d=google.com; s=arc-20160816; b=i7uMMxiNgT9veoiEGGrWNZsjMoy4ELyg74BGoCBpP6X6stGMKVgxGISLP3Ot2qTxzg iAkE/DOJxdiSR5ja1H/vpWsV4fmJg3/eWayE+FBvmCLsorrujOmLQXeowlWWosbUZGdu E+Z7W8PA9rNLKQTdfO6mgGLX2KecuYp/7jMlzAYVMPI9/SqoQIBk4Zgd6pWDjcJ1oiUP LSX55zuT02rur2BPjwoBU8nwgUcOpwjmerYXpX4Kcgh5ayhTPO0DhopjB5ao70UlHBoh 4vXDtDlJsskm12hk9k+x7x57H75kGsC+OAEtwWecFYQbnanKnJdnP/LRUGuNY29oGEFC dbAQ== 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=DZN3pgQUIY7PA9plK/mJnx6aAWGljvcssjc1CbSDKiw=; b=IVzfjD44zF55Q0cDYzl3eVkleRhfmY8Rv1Mu9MqTeWbJ2TBcu4nTFJzBfMxSW1pnRe JQO8hWBje8e3mHQ5Ve9FSwOy1G4yo5mnZWO6IWBU0qzA5ukNV9x6+DUJ6Xz6Ej0nsy3c HmMJhN8DR5MFc4lykwLGjOvIxBBWroUF+PZ9PaFWUU19CQ3Y0R7pYxDKJJ0f0Z2qPubn JWLYnfskjl25XDe1Z9sUq4JENfL0lqOA+CH70HfNxwpojHpkzWde67utfeFiAWaeuHNS DgI/7hC88HWlujATO2KBnPuzqqNGuuuQLn+DZohLE2ANynxL6CDvtJAlLM0U0/NGLXgl D4SQ== 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=XbhCQDGX; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id j194-v6si276889wmd.60.2018.06.18.05.01.11; Mon, 18 Jun 2018 05:01:11 -0700 (PDT) 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=XbhCQDGX; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 8519A2676FB; Mon, 18 Jun 2018 14:00:17 +0200 (CEST) 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 2E5F2267706; Mon, 18 Jun 2018 14:00:13 +0200 (CEST) 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, RCVD_IN_DNSWL_NONE, SPF_PASS 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 DF6EB2676F2 for ; Mon, 18 Jun 2018 14:00:10 +0200 (CEST) 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=g70CBWVAxlHhr3SPWvouNnjYcMeLbOUaXFY3ODR/BUI=; b=XbhCQDGXwhFO R5QtTqYRsvChCbzTSLHfi245Nb2J3swDi/XHxG9xfCiAfV5bEQA1yJNCGEHR1nzOB2p9f/yQlSmfN kiKFLhYvqAY5uKMz7Qfni2Xp9BtGgXEdiRhTCiAfCEdJjy+Pu8B+p4880Un6bQ0cCdw1Um+Tfnf1f PK1Ns=; 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 1fUspM-0007xp-2L; Mon, 18 Jun 2018 12:00:08 +0000 Received: from broonie by debutante with local (Exim 4.91) (envelope-from ) id 1fUspL-00006z-KP; Mon, 18 Jun 2018 13:00:07 +0100 From: Mark Brown To: Kuninori Morimoto In-Reply-To: <877en4sgi9.wl%kuninori.morimoto.gx@renesas.com> Message-Id: Date: Mon, 18 Jun 2018 13:00:07 +0100 Cc: alsa-devel@alsa-project.org, Mark Brown , Hiroyuki Yokoyama Subject: [alsa-devel] Applied "ASoC: rsnd: add rsnd_daidrv_get()" 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: rsnd: add rsnd_daidrv_get() 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 a0d847c380ba47886fcca4168698eef51c69f109 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Tue, 12 Jun 2018 05:51:46 +0000 Subject: [PATCH] ASoC: rsnd: add rsnd_daidrv_get() rsnd priv has many parameters. On __rsnd_dai_probe() it uses rsnd_rdai_get() to get rdai pointer, but is using priv->daidrv directly to get daidrvhv, but it is confusable for reader. This patch adds rsnd_daidrv_get() to get daidrv from priv. Now reader can understand that rdai and daidrv are related. Signed-off-by: Kuninori Morimoto Tested-by: Hiroyuki Yokoyama Signed-off-by: Mark Brown --- sound/soc/sh/rcar/core.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) -- 2.17.1 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index eac22fef4543..6091e0916085 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -548,6 +548,15 @@ struct rsnd_dai *rsnd_rdai_get(struct rsnd_priv *priv, int id) return priv->rdai + id; } +static struct snd_soc_dai_driver +*rsnd_daidrv_get(struct rsnd_priv *priv, int id) +{ + if ((id < 0) || (id >= rsnd_rdai_nr(priv))) + return NULL; + + return priv->daidrv + id; +} + #define rsnd_dai_to_priv(dai) snd_soc_dai_get_drvdata(dai) static struct rsnd_dai *rsnd_dai_to_rdai(struct snd_soc_dai *dai) { @@ -1033,7 +1042,7 @@ static void __rsnd_dai_probe(struct rsnd_priv *priv, int io_i; rdai = rsnd_rdai_get(priv, dai_i); - drv = priv->daidrv + dai_i; + drv = rsnd_daidrv_get(priv, dai_i); io_playback = &rdai->playback; io_capture = &rdai->capture;