wifi: wilc1000: Convert using devm_clk_get_optional_enabled() in wilc_sdio_probe()

Use devm_clk_get_optional_enabled() instead of devm_clk_get_optional() +
clk_prepare_enable(), which can make the clk consistent with the device
life cycle and reduce the risk of unreleased clk resources. Since the
device framework has automatically released the clk resource, there is
no need to execute clk_disable_unprepare(clk) on the error path, drop
the clk_disable_unprepare label, and the original error process can change
to dispose_irq.

Signed-off-by: Li Zetao <lizetao1@huawei.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://patch.msgid.link/20240903110205.4127706-2-lizetao1@huawei.com

diff --git a/drivers/net/wireless/microchip/wilc1000/sdio.c b/drivers/net/wireless/microchip/wilc1000/sdio.c
index 683a35c682a8f66eead4949d2996b59cc9c0241a..b4da05d5a498a0e997a5c3bad4094ea95d2c6b6a 100644 (file)
--- a/drivers/net/wireless/microchip/wilc1000/sdio.c
+++ b/drivers/net/wireless/microchip/wilc1000/sdio.c
@@ -174,19 +174,18 @@ static int wilc_sdio_probe(struct sdio_func *func,
        wilc->bus_data = sdio_priv;
        wilc->dev = &func->dev;
 
-       wilc->rtc_clk = devm_clk_get_optional(&func->card->dev, "rtc");
+       wilc->rtc_clk = devm_clk_get_optional_enabled(&func->card->dev, "rtc");
        if (IS_ERR(wilc->rtc_clk)) {
                ret = PTR_ERR(wilc->rtc_clk);
                goto dispose_irq;
        }
-       clk_prepare_enable(wilc->rtc_clk);
 
        wilc_sdio_init(wilc, false);
 
        ret = wilc_load_mac_from_nv(wilc);
        if (ret) {
                pr_err("Can not retrieve MAC address from chip\n");
-               goto clk_disable_unprepare;
+               goto dispose_irq;
        }
 
        wilc_sdio_deinit(wilc);
@@ -195,14 +194,12 @@ static int wilc_sdio_probe(struct sdio_func *func,
                                   NL80211_IFTYPE_STATION, false);
        if (IS_ERR(vif)) {
                ret = PTR_ERR(vif);
-               goto clk_disable_unprepare;
+               goto dispose_irq;
        }
 
        dev_info(&func->dev, "Driver Initializing success\n");
        return 0;
 
-clk_disable_unprepare:
-       clk_disable_unprepare(wilc->rtc_clk);
 dispose_irq:
        irq_dispose_mapping(wilc->dev_irq_num);
        wilc_netdev_cleanup(wilc);
@@ -217,7 +214,6 @@ static void wilc_sdio_remove(struct sdio_func *func)
        struct wilc *wilc = sdio_get_drvdata(func);
        struct wilc_sdio *sdio_priv = wilc->bus_data;
 
-       clk_disable_unprepare(wilc->rtc_clk);
        wilc_netdev_cleanup(wilc);
        kfree(sdio_priv->cmd53_buf);
        kfree(sdio_priv);