Skip to content

Commit 8d2aaf4

Browse files
qianfengrongBartosz Golaszewski
authored andcommitted
gpio: zynq: Simplify using devm_clk_get_enabled()
Use devm_clk_get_enabled() simplify zynq_gpio_probe() and zynq_gpio_remove(). Acked-by: Michal Simek <michal.simek@amd.com> Signed-off-by: Rong Qianfeng <rongqianfeng@vivo.com> Link: https://lore.kernel.org/r/20240820121651.29706-3-rongqianfeng@vivo.com Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
1 parent e9482dc commit 8d2aaf4

File tree

1 file changed

+1
-9
lines changed

1 file changed

+1
-9
lines changed

drivers/gpio/gpio-zynq.c

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -940,16 +940,10 @@ static int zynq_gpio_probe(struct platform_device *pdev)
940940
chip->ngpio = gpio->p_data->ngpio;
941941

942942
/* Retrieve GPIO clock */
943-
gpio->clk = devm_clk_get(&pdev->dev, NULL);
943+
gpio->clk = devm_clk_get_enabled(&pdev->dev, NULL);
944944
if (IS_ERR(gpio->clk))
945945
return dev_err_probe(&pdev->dev, PTR_ERR(gpio->clk), "input clock not found.\n");
946946

947-
ret = clk_prepare_enable(gpio->clk);
948-
if (ret) {
949-
dev_err(&pdev->dev, "Unable to enable clock.\n");
950-
return ret;
951-
}
952-
953947
spin_lock_init(&gpio->dirlock);
954948

955949
pm_runtime_set_active(&pdev->dev);
@@ -999,7 +993,6 @@ static int zynq_gpio_probe(struct platform_device *pdev)
999993
pm_runtime_put(&pdev->dev);
1000994
err_pm_dis:
1001995
pm_runtime_disable(&pdev->dev);
1002-
clk_disable_unprepare(gpio->clk);
1003996

1004997
return ret;
1005998
}
@@ -1019,7 +1012,6 @@ static void zynq_gpio_remove(struct platform_device *pdev)
10191012
if (ret < 0)
10201013
dev_warn(&pdev->dev, "pm_runtime_get_sync() Failed\n");
10211014
gpiochip_remove(&gpio->chip);
1022-
clk_disable_unprepare(gpio->clk);
10231015
device_set_wakeup_capable(&pdev->dev, 0);
10241016
pm_runtime_disable(&pdev->dev);
10251017
}

0 commit comments

Comments
 (0)