From patchwork Fri Apr 13 10:55:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 133352 Delivered-To: patch@linaro.org Received: by 10.46.84.18 with SMTP id i18csp596237ljb; Fri, 13 Apr 2018 03:55:51 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+LVm4uL6XhPhGjs/KH5qtboa6VXYaReYBP65k9eb4SRHgDOdBpMHQ++x6NouV/W7HqkiNi X-Received: by 10.223.148.226 with SMTP id 89mr2765640wrr.121.1523616951798; Fri, 13 Apr 2018 03:55:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523616951; cv=none; d=google.com; s=arc-20160816; b=rXXhO2UOO+DJAo2HAvcSk4rg6xZsMY3aQHs4nvP1ppTAXNvLr1zrj3decOGfMnXucf NNFUDXMN9Joq67oBzZs2rTxSXr7s69luWLlbnF/5X1kfjESquUvVYQPdmbLI/I4NWvZV tTNDImkK0KiNAbkhb2sVMEHg9l3HCj3FcFK7brVE8MsN+bQBmnzGTVwHya5QawWJMHz8 5r4KVsBZNSzO4WrGVLT27MF9/TIBN4d7KjjcUboGJpDrDXME7ptjI40H9JvAiUabEsS3 1mav0SlYYh+1FNzlksZg6mYl5xyBq6a1UcCVGVaW8llb5rAKNG4084r2490enLas6YSd csoQ== 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=zpY+ny3hh5qwGNvXWIcJnrGyfb1KVlKhDLcTNOZWzxI=; b=C3TuVaCNHvXwVLOV00UD95Bur9/GXLVbtLsUawCaLt2PjpN46h55YujV++c/2nVLSI r2wAamA4W3hukvo8bk7y2zZB/LDhQWrGw6Nk9bDJ3nyfSJ1TBAc2GBS31eTvvBJfN5mX 53/NYUkd4FQju7g2E/Ww2Fjz1H+IYzJJ3Zgcb+TBcBRqOOtJ9tZOWVVV0ChXHgrZhzX3 Wa9qA3ojvmgn/DSOBzdA/GnVFn3BOcCXCd3vJwmxB783Ryl3Z+F0EQ8uQTnZogpp190y hoYMHRLuJmTZT+vYmPyZG0WvzZ6HHEhu5XEkIWSlGE+5jzJI7ht8bSgS+eS8Cqm8ODYs DLLw== 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=PllmmG9T; 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 u136si1117101wmf.119.2018.04.13.03.55.51; Fri, 13 Apr 2018 03:55:51 -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=PllmmG9T; 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 092532673C4; Fri, 13 Apr 2018 12:55:41 +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 8B7382673A6; Fri, 13 Apr 2018 12:55:37 +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 6623226739D for ; Fri, 13 Apr 2018 12:55:35 +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=yLnfjyTIyDPA67XMSvjaKeYPMGGiVJp8S7NnVr0zXzo=; b=PllmmG9TglJ6 HjSvbEOdUqs+IxqlHUAjL/uZewNipqdjyYlX5JA4e5j2s+3Nmq5V5b/Bv7jrLHJpZMahND+obImQB kpggnMIlXc3/pGOadWxlzOcbzGN7/D8bo1FAjwjAgmHxL5l+m3gw75/1w7sp5+hbu6Q2GgFhiszs/ UTDD0=; 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 1f6wMe-000866-Jn; Fri, 13 Apr 2018 10:55:32 +0000 Received: from broonie by debutante with local (Exim 4.90_1) (envelope-from ) id 1f6wMe-00074L-4j; Fri, 13 Apr 2018 11:55:32 +0100 From: Mark Brown To: Kuninori Morimoto In-Reply-To: <87k1tklwr9.wl%kuninori.morimoto.gx@renesas.com> Message-Id: Date: Fri, 13 Apr 2018 11:55:32 +0100 Cc: alsa-devel@alsa-project.org, Mark Brown Subject: [alsa-devel] Applied "ASoC: rsnd: makes rsnd_cmd_mod_get() static" 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: makes rsnd_cmd_mod_get() static 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 8c1ddea58b080d33ce4921b45387c146ddb91751 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Fri, 6 Apr 2018 05:41:43 +0000 Subject: [PATCH] ASoC: rsnd: makes rsnd_cmd_mod_get() static rsnd_cmd_mod_get() is used from cmd.c only. Let's makes it static function Signed-off-by: Kuninori Morimoto Signed-off-by: Mark Brown --- sound/soc/sh/rcar/cmd.c | 15 +++++++-------- sound/soc/sh/rcar/rsnd.h | 1 - 2 files changed, 7 insertions(+), 9 deletions(-) -- 2.17.0 _______________________________________________ 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/cmd.c b/sound/soc/sh/rcar/cmd.c index f1d4fb566892..4221937ae79b 100644 --- a/sound/soc/sh/rcar/cmd.c +++ b/sound/soc/sh/rcar/cmd.c @@ -125,6 +125,13 @@ static struct rsnd_mod_ops rsnd_cmd_ops = { .stop = rsnd_cmd_stop, }; +static struct rsnd_mod *rsnd_cmd_mod_get(struct rsnd_priv *priv, int id) +{ + if (WARN_ON(id < 0 || id >= rsnd_cmd_nr(priv))) + id = 0; + + return rsnd_mod_get((struct rsnd_cmd *)(priv->cmd) + id); +} int rsnd_cmd_attach(struct rsnd_dai_stream *io, int id) { struct rsnd_priv *priv = rsnd_io_to_priv(io); @@ -133,14 +140,6 @@ int rsnd_cmd_attach(struct rsnd_dai_stream *io, int id) return rsnd_dai_connect(mod, io, mod->type); } -struct rsnd_mod *rsnd_cmd_mod_get(struct rsnd_priv *priv, int id) -{ - if (WARN_ON(id < 0 || id >= rsnd_cmd_nr(priv))) - id = 0; - - return rsnd_mod_get((struct rsnd_cmd *)(priv->cmd) + id); -} - int rsnd_cmd_probe(struct rsnd_priv *priv) { struct device *dev = rsnd_priv_to_dev(priv); diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h index 172c8d612890..ab4d55548ed1 100644 --- a/sound/soc/sh/rcar/rsnd.h +++ b/sound/soc/sh/rcar/rsnd.h @@ -775,7 +775,6 @@ struct rsnd_mod *rsnd_dvc_mod_get(struct rsnd_priv *priv, int id); int rsnd_cmd_probe(struct rsnd_priv *priv); void rsnd_cmd_remove(struct rsnd_priv *priv); int rsnd_cmd_attach(struct rsnd_dai_stream *io, int id); -struct rsnd_mod *rsnd_cmd_mod_get(struct rsnd_priv *priv, int id); void rsnd_mod_make_sure(struct rsnd_mod *mod, enum rsnd_mod_type type); #ifdef DEBUG