Merge tag 'io_uring-6.1-2022-10-13' of git://git.kernel.dk/linux

[linux-block.git] / drivers / clk / clk.c

diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index bd0b35cac83e379e192afa6e966b996778ff570e..dd810bcd270026b296db13d972727c714074d328 100644 (file)
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -2188,7 +2188,7 @@ static int clk_core_set_rate_nolock(struct clk_core *core,
 {
        struct clk_core *top, *fail_clk;
        unsigned long rate;
-       int ret = 0;
+       int ret;
 
        if (!core)
                return 0;
@@ -3461,7 +3461,7 @@ static void clk_core_reparent_orphans_nolock(void)
 
                /*
                 * We need to use __clk_set_parent_before() and _after() to
-                * to properly migrate any prepare/enable count of the orphan
+                * properly migrate any prepare/enable count of the orphan
                 * clock. This is important for CLK_IS_CRITICAL clocks, which
                 * are enabled during init but might not have a parent yet.
                 */
@@ -3671,7 +3671,6 @@ static int __clk_core_init(struct clk_core *core)
 
        clk_core_reparent_orphans_nolock();
 
-
        kref_init(&core->ref);
 out:
        clk_pm_runtime_put(core);
@@ -4750,32 +4749,6 @@ void of_clk_del_provider(struct device_node *np)
 }
 EXPORT_SYMBOL_GPL(of_clk_del_provider);
 
-static int devm_clk_provider_match(struct device *dev, void *res, void *data)
-{
-       struct device_node **np = res;
-
-       if (WARN_ON(!np || !*np))
-               return 0;
-
-       return *np == data;
-}
-
-/**
- * devm_of_clk_del_provider() - Remove clock provider registered using devm
- * @dev: Device to whose lifetime the clock provider was bound
- */
-void devm_of_clk_del_provider(struct device *dev)
-{
-       int ret;
-       struct device_node *np = get_clk_provider_node(dev);
-
-       ret = devres_release(dev, devm_of_clk_release_provider,
-                            devm_clk_provider_match, np);
-
-       WARN_ON(ret);
-}
-EXPORT_SYMBOL(devm_of_clk_del_provider);
-
 /**
  * of_parse_clkspec() - Parse a DT clock specifier for a given device node
  * @np: device node to parse clock specifier from