Commit 8d2aaf43 authored by Rong Qianfeng's avatar Rong Qianfeng Committed by Bartosz Golaszewski
Browse files

gpio: zynq: Simplify using devm_clk_get_enabled() 



Use devm_clk_get_enabled() simplify zynq_gpio_probe() and zynq_gpio_remove().

Acked-by: default avatarMichal Simek <michal.simek@amd.com>
Signed-off-by: default avatarRong Qianfeng <rongqianfeng@vivo.com>
Link: https://lore.kernel.org/r/20240820121651.29706-3-rongqianfeng@vivo.com


Signed-off-by: default avatarBartosz Golaszewski <bartosz.golaszewski@linaro.org>
parent e9482dc5

drivers/gpio/gpio-zynq.c

+1 −9
Original line number Diff line number Diff line
@@ -940,16 +940,10 @@ static int zynq_gpio_probe(struct platform_device *pdev) 
	chip->ngpio = gpio->p_data->ngpio;



	/* Retrieve GPIO clock */

	gpio->clk = devm_clk_get(&pdev->dev, NULL);

	gpio->clk = devm_clk_get_enabled(&pdev->dev, NULL);

	if (IS_ERR(gpio->clk))

		return dev_err_probe(&pdev->dev, PTR_ERR(gpio->clk), "input clock not found.\n");



	ret = clk_prepare_enable(gpio->clk);

	if (ret) {

		dev_err(&pdev->dev, "Unable to enable clock.\n");

		return ret;

	}



	spin_lock_init(&gpio->dirlock);



	pm_runtime_set_active(&pdev->dev);
@@ -999,7 +993,6 @@ static int zynq_gpio_probe(struct platform_device *pdev) 
	pm_runtime_put(&pdev->dev);

err_pm_dis:

	pm_runtime_disable(&pdev->dev);

	clk_disable_unprepare(gpio->clk);



	return ret;

}
@@ -1019,7 +1012,6 @@ static void zynq_gpio_remove(struct platform_device *pdev) 
	if (ret < 0)

		dev_warn(&pdev->dev, "pm_runtime_get_sync() Failed\n");

	gpiochip_remove(&gpio->chip);

	clk_disable_unprepare(gpio->clk);

	device_set_wakeup_capable(&pdev->dev, 0);

	pm_runtime_disable(&pdev->dev);

}