From patchwork Fri Apr 13 11:23:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 133362 Delivered-To: patch@linaro.org Received: by 10.46.84.18 with SMTP id i18csp621285ljb; Fri, 13 Apr 2018 04:23:57 -0700 (PDT) X-Google-Smtp-Source: AIpwx48ND2jYFuITS4jjXmC1znGvvdwEto2MbkRu47RewNTut6FPGuQ1uSDgnHI3A0j6vakinzpK X-Received: by 10.223.226.14 with SMTP id j14mr3336568wri.17.1523618637029; Fri, 13 Apr 2018 04:23:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523618637; cv=none; d=google.com; s=arc-20160816; b=z2oDXGVWyHFYdLzmmy3oTOiU3YjEj1fb52kq4avS15TREoa/37u4uJQ/FCH0uT5uQ7 PQfzVg82b6UlPexS2ycF6eMCMpaOSsEE1B1CDHBjluS4GH7/FbnOGMD3azfRzOzuwiqP IJ3xMTzooKVEGFwNUC9o/wkNGJyJF5Z0QfB+4QwMGwkSDro9KDkNB2mYJTQBaB/Ft/jh plTmxXoEPAMHerH6gON9/PxSs8RNiqpwcWeoN+TVX9VL7Xbq3MBpJAH1DZMiD7ghrezt GiAARHQ/8rTx6crWEvDAMQLT90cdvN79Uh5qXU6hXIf7ApTEzMt9rcLbNUetzrUtPGrt AKAw== 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=KEz6COxQu7hlu1Yki4TZsfsO+ucskW1Ln7wjGZoADdX7soHSRE+pr2YoV0n5r8TAq1 aBMhLS9uTHlTa8va+QMrhs8jRLPCD5JRQYGxsi3WHTyPLVzbdbri4nQYz4wZ33cDjBt3 nXQvFHsZmdsQVYzbVRH0HeRtyK45aocevnDqI6e1AmmbtNC98rtyQ5JU5cZhvjRFWRb+ 1op33FeZfZBgPFbXh59YRsFWzG82T37joDQPhIUONgK0XG+EFiq+q/6h27BPZfTqPuWJ 4tRlIumEm2L/RDlYf+SuwWdOJEARvn/zqIMeinqyUaAiOdS5ELRayVWhM4HHjQ3aa5Oc 1/qQ== 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=S7TX+mVx; 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 i17si71431wmb.129.2018.04.13.04.23.56; Fri, 13 Apr 2018 04:23:57 -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=S7TX+mVx; 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 562AD2675DA; Fri, 13 Apr 2018 13:23:48 +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 C172F267403; Fri, 13 Apr 2018 13:23:45 +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 EDEF426735C for ; Fri, 13 Apr 2018 13:23:41 +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=S7TX+mVxze+g wWmmCfqDAdF3qtR9iXJTwzP5MOagW5abqPF9xBb46ey4drk1Do0hjRcbXE4/y+gOE4MR67spTjSFM UkD0vVvg3qE1ye++tv22yMYA5Uorff5Qa/BWPlPsG+pn5x4o+AWKl2DCK0loJ+o6ZB3ztq0Cz45p6 3ima0=; 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 1f6wns-0008Bu-4k; Fri, 13 Apr 2018 11:23:40 +0000 Received: from broonie by debutante with local (Exim 4.90_1) (envelope-from ) id 1f6wnr-00007K-MB; Fri, 13 Apr 2018 12:23:39 +0100 From: Mark Brown To: Kuninori Morimoto In-Reply-To: <87k1tklwr9.wl%kuninori.morimoto.gx@renesas.com> Message-Id: Date: Fri, 13 Apr 2018 12:23:39 +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