Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull clk fixes from Stephen Boyd:
 "Some hot fixes for clk driver patches merged last week and one oops
  fix:

   - Fix license on recent MediaTek drivers

   - Initialize a variable before use in the new Visconti driver

   - Avoid an oops by unregistering the clk provider in si5341"

* tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux:
  clk: mediatek: relicense mt7986 clock driver to GPL-2.0
  clk: visconti: Fix uninitialized variable in printk
  clk: si5341: Fix clock HW provider cleanup

diff --git a/drivers/clk/clk-si5341.c b/drivers/clk/clk-si5341.c
index 57ae183982d8c31dcdebd73cc61ad2e73e62671b..f7b41366666e544c2341c7dde1abc9be659764b5 100644 (file)
--- a/drivers/clk/clk-si5341.c
+++ b/drivers/clk/clk-si5341.c
@@ -1740,7 +1740,7 @@ static int si5341_probe(struct i2c_client *client,
                        clk_prepare(data->clk[i].hw.clk);
        }
 
-       err = of_clk_add_hw_provider(client->dev.of_node, of_clk_si5341_get,
+       err = devm_of_clk_add_hw_provider(&client->dev, of_clk_si5341_get,
                        data);
        if (err) {
                dev_err(&client->dev, "unable to add clk provider\n");

diff --git a/drivers/clk/mediatek/clk-mt7986-apmixed.c b/drivers/clk/mediatek/clk-mt7986-apmixed.c
index 76c8ebdeae96dc93638c163b2c08ff147fe19f7a..98ec3887585fca4f7e13de32e3f090e892bc87bf 100644 (file)
--- a/drivers/clk/mediatek/clk-mt7986-apmixed.c
+++ b/drivers/clk/mediatek/clk-mt7986-apmixed.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-1.0
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2021 MediaTek Inc.
  * Author: Sam Shih <sam.shih@mediatek.com>

diff --git a/drivers/clk/mediatek/clk-mt7986-infracfg.c b/drivers/clk/mediatek/clk-mt7986-infracfg.c
index 3be168c34fc0a8e3bffa77730114796ed0e51d65..f209c559fbc3ac3f3f8aa104c1fcf93e070caf38 100644 (file)
--- a/drivers/clk/mediatek/clk-mt7986-infracfg.c
+++ b/drivers/clk/mediatek/clk-mt7986-infracfg.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-1.0
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2021 MediaTek Inc.
  * Author: Sam Shih <sam.shih@mediatek.com>

diff --git a/drivers/clk/mediatek/clk-mt7986-topckgen.c b/drivers/clk/mediatek/clk-mt7986-topckgen.c
index 8550e2be7773dbba1a9bc9a176ec779426151465..8f6f79b6e31efb1338661eea5fa529989c925a5c 100644 (file)
--- a/drivers/clk/mediatek/clk-mt7986-topckgen.c
+++ b/drivers/clk/mediatek/clk-mt7986-topckgen.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-1.0
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2021 MediaTek Inc.
  * Author: Sam Shih <sam.shih@mediatek.com>

diff --git a/drivers/clk/visconti/pll.c b/drivers/clk/visconti/pll.c
index a2398bc6c6e48cacbe89b6458d2add3e36c595f2..a484cb945d67bacd6cf418143b81914020b74ad8 100644 (file)
--- a/drivers/clk/visconti/pll.c
+++ b/drivers/clk/visconti/pll.c
@@ -246,7 +246,6 @@ static struct clk_hw *visconti_register_pll(struct visconti_pll_provider *ctx,
 {
        struct clk_init_data init;
        struct visconti_pll *pll;
-       struct clk *pll_clk;
        struct clk_hw *pll_hw_clk;
        size_t len;
        int ret;
@@ -277,7 +276,7 @@ static struct clk_hw *visconti_register_pll(struct visconti_pll_provider *ctx,
        pll_hw_clk = &pll->hw;
        ret = clk_hw_register(NULL, &pll->hw);
        if (ret) {
-               pr_err("failed to register pll clock %s : %ld\n", name, PTR_ERR(pll_clk));
+               pr_err("failed to register pll clock %s : %d\n", name, ret);
                kfree(pll);
                pll_hw_clk = ERR_PTR(ret);
        }