openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

pinctrl: at91: Merge clk_prepare and clk_enable into clk_prepare_enable 

This simplifies the normal as well as the error path.

Signed-off-by: Alexander Stein <alexanders83@web.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Alexander Stein 2016-04-29 14:50:03 +02:00 committed by Linus Walleij
parent 234b6513fc
commit 7d3a3fe648
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/pinctrl/pinctrl-at91.c
View File

@ -1722,14 +1722,9 @@ static int at91_gpio_probe(struct platform_device *pdev)
goto err; goto err;
} }
ret = clk_prepare(at91_chip->clock); ret = clk_prepare_enable(at91_chip->clock);
if (ret)
goto clk_prepare_err;
/* enable PIO controller's clock */
ret = clk_enable(at91_chip->clock);
if (ret) { 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; goto clk_enable_err;
} }
@ -1789,10 +1784,8 @@ static int at91_gpio_probe(struct platform_device *pdev)
irq_setup_err: irq_setup_err:
gpiochip_remove(chip); gpiochip_remove(chip);
gpiochip_add_err: gpiochip_add_err:
clk_disable(at91_chip->clock);
clk_enable_err: clk_enable_err:
clk_unprepare(at91_chip->clock); clk_disable_unprepare(at91_chip->clock);
clk_prepare_err:
err: err:
dev_err(&pdev->dev, "Failure %i for GPIO %i\n", ret, alias_idx); dev_err(&pdev->dev, "Failure %i for GPIO %i\n", ret, alias_idx);