Skip to contentSkip to conversation

ASoC: rsnd: Remove CLK_IS_ROOT

PATCH In review Stephen Boyd 3 participants 3 messages Apr 20, 2016

Subsystems (3)
Sound ASoC Arm/RISC-V/Renesas architecture
lore
Share & tools
lore

Stephen Boyd

author
#0 lore raw

PATCH 1/1 ASoC: rsnd: Remove CLK_IS_ROOT

This flag is a no-op now (see commit 47b0eeb3dc8a "clk: Deprecate CLK_IS_ROOT", 2016-02-02) so remove it.

Cc Kuninori Morimoto <[email protected]>
Signed-off-by Stephen Boyd <[email protected]>
---
 sound/soc/sh/rcar/adg.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
sound/soc/sh/rcar/adg.c +2 -6
index 606399de684d..49354d17ea55 100644
@@ -492,9 +492,7 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv,
 	 */
 	if (!count) {
 		clk = clk_register_fixed_rate(dev, clkout_name[CLKOUT],
-					      parent_clk_name,
-					      (parent_clk_name) ?
-					      0 : CLK_IS_ROOT, req_rate);
+					      parent_clk_name, 0, req_rate);
 		if (!IS_ERR(clk)) {
 			adg->clkout[CLKOUT] = clk;
 			of_clk_add_provider(np, of_clk_src_simple_get, clk);

@@ -506,9 +504,7 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv,
 	else {
 		for (i = 0; i < CLKOUTMAX; i++) {
 			clk = clk_register_fixed_rate(dev, clkout_name[i],
-						      parent_clk_name,
-						      (parent_clk_name) ?
-						      0 : CLK_IS_ROOT,
+						      parent_clk_name, 0,
 						      req_rate);
 			if (!IS_ERR(clk)) {
 				adg->onecell.clks	= adg->clkout;
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
maintainer
#2 lore raw

Applied "ASoC: rsnd: Remove CLK_IS_ROOT" to the asoc tree

In reply to Stephen Boyd

The patch

ASoC: rsnd: Remove CLK_IS_ROOT

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

Quoted 1 line

From 2ebdf684082fa9ad924df1b2f80653920c7ca097 Mon Sep 17 00:00:00 2001

From: Stephen Boyd <[email protected]>
Date: Tue, 19 Apr 2016 18:08:00 -0700
Subject: [PATCH] ASoC: rsnd: Remove CLK_IS_ROOT

This flag is a no-op now (see commit 47b0eeb3dc8a "clk: Deprecate CLK_IS_ROOT", 2016-02-02) so remove it.

Signed-off-by Stephen Boyd <[email protected]>
Acked-by Kuninori Morimoto <[email protected]>
Signed-off-by Mark Brown <[email protected]>
---
 sound/soc/sh/rcar/adg.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
sound/soc/sh/rcar/adg.c +2 -6
index 606399de684d..49354d17ea55 100644
@@ -492,9 +492,7 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv,
 	 */
 	if (!count) {
 		clk = clk_register_fixed_rate(dev, clkout_name[CLKOUT],
-					      parent_clk_name,
-					      (parent_clk_name) ?
-					      0 : CLK_IS_ROOT, req_rate);
+					      parent_clk_name, 0, req_rate);
 		if (!IS_ERR(clk)) {
 			adg->clkout[CLKOUT] = clk;
 			of_clk_add_provider(np, of_clk_src_simple_get, clk);

@@ -506,9 +504,7 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv,
 	else {
 		for (i = 0; i < CLKOUTMAX; i++) {
 			clk = clk_register_fixed_rate(dev, clkout_name[i],
-						      parent_clk_name,
-						      (parent_clk_name) ?
-						      0 : CLK_IS_ROOT,
+						      parent_clk_name, 0,
 						      req_rate);
 			if (!IS_ERR(clk)) {
 				adg->onecell.clks	= adg->clkout;
Signature · 1 line
2.8.0.rc3