From: Mark Brown <broonie@kernel.org> To: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Cc: Mark Brown <broonie@kernel.org>, Mark Brown <broonie@kernel.org>, linux-renesas-soc@vger.kernel.org, Linux-ALSA <alsa-devel@alsa-project.org>, Simon <horms@verge.net.au>, Liam Girdwood <lgirdwood@gmail.com> Subject: Applied "ASoC: rsrc-card: use asoc_simple_card_canonicalize_cpu()" to the asoc tree Date: Wed, 10 Aug 2016 21:03:52 +0100 [thread overview] Message-ID: <E1bXZjE-0000QA-4l@debutante> (raw) In-Reply-To: <87y445gymj.wl%kuninori.morimoto.gx@renesas.com> The patch ASoC: rsrc-card: use asoc_simple_card_canonicalize_cpu() has been applied to the asoc tree at git://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 27b010815bcfbb2cc79de7544547e33e4d169594 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Date: Wed, 10 Aug 2016 02:21:03 +0000 Subject: [PATCH] ASoC: rsrc-card: use asoc_simple_card_canonicalize_cpu() Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org> --- sound/soc/sh/rcar/rsrc-card.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/sound/soc/sh/rcar/rsrc-card.c b/sound/soc/sh/rcar/rsrc-card.c index 0bf17dae2b64..dd5eda1f9a29 100644 --- a/sound/soc/sh/rcar/rsrc-card.c +++ b/sound/soc/sh/rcar/rsrc-card.c @@ -134,7 +134,6 @@ static int rsrc_card_parse_links(struct device_node *np, struct device *dev = rsrc_priv_to_dev(priv); struct snd_soc_dai_link *dai_link = rsrc_priv_to_link(priv, idx); struct asoc_simple_dai *dai_props = rsrc_priv_to_props(priv, idx); - int is_single_links = 0; int ret; /* Parse TDM slot */ @@ -147,6 +146,8 @@ static int rsrc_card_parse_links(struct device_node *np, return ret; if (is_fe) { + int is_single_links = 0; + /* BE is dummy */ dai_link->codec_of_node = NULL; dai_link->codec_dai_name = "snd-soc-dummy-dai"; @@ -171,17 +172,7 @@ static int rsrc_card_parse_links(struct device_node *np, if (ret < 0) return ret; - /* - * In soc_bind_dai_link() will check cpu name after - * of_node matching if dai_link has cpu_dai_name. - * but, it will never match if name was created by - * fmt_single_name() remove cpu_dai_name if cpu_args - * was 0. See: - * fmt_single_name() - * fmt_multiple_name() - */ - if (is_single_links) - dai_link->cpu_dai_name = NULL; + asoc_simple_card_canonicalize_cpu(dai_link, is_single_links); } else { const struct rsrc_card_of_data *of_data; -- 2.8.1
WARNING: multiple messages have this Message-ID (diff)
From: Mark Brown <broonie@kernel.org> To: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Cc: Mark Brown <broonie@kernel.org>Mark Brown <broonie@kernel.org>, linux-renesas-soc@vger.kernel.org, Linux-ALSA <alsa-devel@alsa-project.org>, Simon <horms@verge.net.au>, Liam Girdwood <lgirdwood@gmail.com> Subject: Applied "ASoC: rsrc-card: use asoc_simple_card_canonicalize_cpu()" to the asoc tree Date: Wed, 10 Aug 2016 21:03:52 +0100 [thread overview] Message-ID: <E1bXZjE-0000QA-4l@debutante> (raw) In-Reply-To: <87y445gymj.wl%kuninori.morimoto.gx@renesas.com> The patch ASoC: rsrc-card: use asoc_simple_card_canonicalize_cpu() has been applied to the asoc tree at git://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 27b010815bcfbb2cc79de7544547e33e4d169594 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Date: Wed, 10 Aug 2016 02:21:03 +0000 Subject: [PATCH] ASoC: rsrc-card: use asoc_simple_card_canonicalize_cpu() Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org> --- sound/soc/sh/rcar/rsrc-card.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/sound/soc/sh/rcar/rsrc-card.c b/sound/soc/sh/rcar/rsrc-card.c index 0bf17dae2b64..dd5eda1f9a29 100644 --- a/sound/soc/sh/rcar/rsrc-card.c +++ b/sound/soc/sh/rcar/rsrc-card.c @@ -134,7 +134,6 @@ static int rsrc_card_parse_links(struct device_node *np, struct device *dev = rsrc_priv_to_dev(priv); struct snd_soc_dai_link *dai_link = rsrc_priv_to_link(priv, idx); struct asoc_simple_dai *dai_props = rsrc_priv_to_props(priv, idx); - int is_single_links = 0; int ret; /* Parse TDM slot */ @@ -147,6 +146,8 @@ static int rsrc_card_parse_links(struct device_node *np, return ret; if (is_fe) { + int is_single_links = 0; + /* BE is dummy */ dai_link->codec_of_node = NULL; dai_link->codec_dai_name = "snd-soc-dummy-dai"; @@ -171,17 +172,7 @@ static int rsrc_card_parse_links(struct device_node *np, if (ret < 0) return ret; - /* - * In soc_bind_dai_link() will check cpu name after - * of_node matching if dai_link has cpu_dai_name. - * but, it will never match if name was created by - * fmt_single_name() remove cpu_dai_name if cpu_args - * was 0. See: - * fmt_single_name() - * fmt_multiple_name() - */ - if (is_single_links) - dai_link->cpu_dai_name = NULL; + asoc_simple_card_canonicalize_cpu(dai_link, is_single_links); } else { const struct rsrc_card_of_data *of_data; -- 2.8.1
next prev parent reply other threads:[~2016-08-10 20:04 UTC|newest] Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-08-10 2:19 [PATCH 0/6] ASoC: simple-card: add canonicalize_cpu / clean_reference Kuninori Morimoto 2016-08-10 2:19 ` Kuninori Morimoto 2016-08-10 2:20 ` [PATCH 1/6] ASoC: simple-card-utils: add asoc_simple_card_canonicalize_cpu() Kuninori Morimoto 2016-08-10 2:20 ` Kuninori Morimoto 2016-08-10 20:03 ` Applied "ASoC: simple-card-utils: add asoc_simple_card_canonicalize_cpu()" to the asoc tree Mark Brown 2016-08-10 20:03 ` Mark Brown 2016-08-10 2:20 ` [PATCH 2/6] ASoC: simple-card: use asoc_simple_card_canonicalize_cpu() Kuninori Morimoto 2016-08-10 2:20 ` Kuninori Morimoto 2016-08-10 20:03 ` Applied "ASoC: simple-card: use asoc_simple_card_canonicalize_cpu()" to the asoc tree Mark Brown 2016-08-10 20:03 ` Mark Brown 2016-08-10 2:21 ` [PATCH 3/6] ASoC: rsrc-card: use asoc_simple_card_canonicalize_cpu() Kuninori Morimoto 2016-08-10 2:21 ` Kuninori Morimoto 2016-08-10 20:03 ` Mark Brown [this message] 2016-08-10 20:03 ` Applied "ASoC: rsrc-card: use asoc_simple_card_canonicalize_cpu()" to the asoc tree Mark Brown 2016-08-10 2:21 ` [PATCH 4/6] ASoC: simple-card-utils: add asoc_simple_card_clean_reference() Kuninori Morimoto 2016-08-10 2:21 ` Kuninori Morimoto 2016-08-10 20:03 ` Applied "ASoC: simple-card-utils: add asoc_simple_card_clean_reference()" to the asoc tree Mark Brown 2016-08-10 20:03 ` Mark Brown 2016-08-10 2:21 ` [PATCH 5/6] ASoC: simple-card: use asoc_simple_card_clean_reference() Kuninori Morimoto 2016-08-10 2:21 ` Kuninori Morimoto 2016-08-10 2:22 ` [PATCH 6/6] ASoC: rsrc-card: " Kuninori Morimoto 2016-08-10 2:22 ` Kuninori Morimoto
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=E1bXZjE-0000QA-4l@debutante \ --to=broonie@kernel.org \ --cc=alsa-devel@alsa-project.org \ --cc=horms@verge.net.au \ --cc=kuninori.morimoto.gx@renesas.com \ --cc=lgirdwood@gmail.com \ --cc=linux-renesas-soc@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.