pinctrl: at91: Merge clk_prepare and clk_enable into clk_prepare_enable (7d3a3fe6) · Commits · 戴 / test

drivers/pinctrl/pinctrl-at91.c

+3 −10

Original line number	Diff line number	Diff line
		@@ -1722,14 +1722,9 @@ static int at91_gpio_probe(struct platform_device *pdev)
		goto err;
		}

		ret = clk_prepare(at91_chip->clock);
		if (ret)
		goto clk_prepare_err;

		/* enable PIO controller's clock */
		ret = clk_enable(at91_chip->clock);
		ret = clk_prepare_enable(at91_chip->clock);
		if (ret) {
		dev_err(&pdev->dev, "failed to enable clock, ignoring.\n");
		dev_err(&pdev->dev, "failed to prepare and enable clock, ignoring.\n");
		goto clk_enable_err;
		}

		@@ -1789,10 +1784,8 @@ static int at91_gpio_probe(struct platform_device *pdev)
		irq_setup_err:
		gpiochip_remove(chip);
		gpiochip_add_err:
		clk_disable(at91_chip->clock);
		clk_enable_err:
		clk_unprepare(at91_chip->clock);
		clk_prepare_err:
		clk_disable_unprepare(at91_chip->clock);
		err:
		dev_err(&pdev->dev, "Failure %i for GPIO %i\n", ret, alias_idx);