OSDN Git Service

ASoC: rsnd: Remove CLK_IS_ROOT
authorStephen Boyd <sboyd@codeaurora.org>
Wed, 20 Apr 2016 01:08:00 +0000 (18:08 -0700)
committerMark Brown <broonie@kernel.org>
Wed, 20 Apr 2016 09:13:58 +0000 (10:13 +0100)
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 <sboyd@codeaurora.org>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/sh/rcar/adg.c

index 606399d..49354d1 100644 (file)
@@ -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;