Commit 3e46c18d authored by Marco Scardovi's avatar Marco Scardovi Committed by Bartosz Golaszewski
Browse files

gpio: rockchip: convert bank->clk to devm_clk_get_enabled() 



The bank->clk was previously obtained via of_clk_get() and manually
prepared/enabled. However, it was missing a corresponding clk_put() in
both the error paths and the remove function, leading to a reference leak.

Convert the allocation to devm_clk_get_enabled(), which also properly
propagates failures from clk_prepare_enable() that were previously ignored.

The GPIO bank device uses the same OF node as the previous of_clk_get()
call, so devm_clk_get_enabled(dev, NULL) correctly resolves the same
clock provider entry.

Fix the reference leak and simplify the code by removing the manual
clk_disable_unprepare() calls in the probe error paths and in the
remove function.

Fixes: 936ee267 ("gpio/rockchip: add driver for rockchip gpio")
Assisted-by: Antigravity:gemini-3.5-flash
Signed-off-by: default avatarMarco Scardovi <scardracs@disroot.org>
Link: https://patch.msgid.link/20260526171050.12785-2-scardracs@disroot.org


Signed-off-by: default avatarBartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
parent 8a122b5e

drivers/gpio/gpio-rockchip.c

+1 −5
Original line number Diff line number Diff line
@@ -656,11 +656,10 @@ static int rockchip_get_bank_data(struct rockchip_pin_bank *bank) 
	if (!bank->irq)

		return -EINVAL;



	bank->clk = of_clk_get(bank->of_node, 0);

	bank->clk = devm_clk_get_enabled(bank->dev, NULL);

	if (IS_ERR(bank->clk))

		return PTR_ERR(bank->clk);



	clk_prepare_enable(bank->clk);

	id = readl(bank->reg_base + gpio_regs_v2.version_id);



	switch (id) {
@@ -672,7 +671,6 @@ static int rockchip_get_bank_data(struct rockchip_pin_bank *bank) 
		bank->db_clk = of_clk_get(bank->of_node, 1);

		if (IS_ERR(bank->db_clk)) {

			dev_err(bank->dev, "cannot find debounce clk\n");

			clk_disable_unprepare(bank->clk);

			return -EINVAL;

		}

		break;
@@ -751,7 +749,6 @@ static int rockchip_gpio_probe(struct platform_device *pdev) 


	ret = rockchip_gpiolib_register(bank);

	if (ret) {

		clk_disable_unprepare(bank->clk);

		mutex_unlock(&bank->deferred_lock);

		return ret;

	}
@@ -792,7 +789,6 @@ static void rockchip_gpio_remove(struct platform_device *pdev) 
{

	struct rockchip_pin_bank *bank = platform_get_drvdata(pdev);



	clk_disable_unprepare(bank->clk);

	gpiochip_remove(&bank->gpio_chip);

}