Commit 7dc92ece authored by Wang Jianzheng's avatar Wang Jianzheng Committed by Linus Walleij
Browse files

pinctrl: sunxi: Use devm_clk_get_enabled() helpers 



sunxi sunxi_pinctrl_init_with_variant get, enable clk and
deinit_device disable and unprepare it.

This simplifes the code and avoids the calls to
clk_disable_unprepare().

Signed-off-by: default avatarWang Jianzheng <wangjianzheng@vivo.com>
Link: https://lore.kernel.org/20240829064737.16169-1-wangjianzheng@vivo.com


Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 5213518d

drivers/pinctrl/sunxi/pinctrl-sunxi.c

+4 −10
Original line number Diff line number Diff line
@@ -1603,30 +1603,26 @@ int sunxi_pinctrl_init_with_variant(struct platform_device *pdev, 
	}



	ret = of_clk_get_parent_count(node);

	clk = devm_clk_get(&pdev->dev, ret == 1 ? NULL : "apb");

	clk = devm_clk_get_enabled(&pdev->dev, ret == 1 ? NULL : "apb");

	if (IS_ERR(clk)) {

		ret = PTR_ERR(clk);

		goto gpiochip_error;

	}



	ret = clk_prepare_enable(clk);

	if (ret)

		goto gpiochip_error;



	pctl->irq = devm_kcalloc(&pdev->dev,

				 pctl->desc->irq_banks,

				 sizeof(*pctl->irq),

				 GFP_KERNEL);

	if (!pctl->irq) {

		ret = -ENOMEM;

		goto clk_error;

		goto gpiochip_error;

	}



	for (i = 0; i < pctl->desc->irq_banks; i++) {

		pctl->irq[i] = platform_get_irq(pdev, i);

		if (pctl->irq[i] < 0) {

			ret = pctl->irq[i];

			goto clk_error;

			goto gpiochip_error;

		}

	}
@@ -1637,7 +1633,7 @@ int sunxi_pinctrl_init_with_variant(struct platform_device *pdev, 
	if (!pctl->domain) {

		dev_err(&pdev->dev, "Couldn't register IRQ domain\n");

		ret = -ENOMEM;

		goto clk_error;

		goto gpiochip_error;

	}



	for (i = 0; i < (pctl->desc->irq_banks * IRQ_PER_BANK); i++) {
@@ -1669,8 +1665,6 @@ int sunxi_pinctrl_init_with_variant(struct platform_device *pdev, 


	return 0;



clk_error:

	clk_disable_unprepare(clk);

gpiochip_error:

	gpiochip_remove(pctl->chip);

	return ret;