leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pinctrl/spear: plgpio: don't call prepare/unprepare

Browse Source 
SPEAr SoC's don't do anything in clk_prepare() of plgpio driver,
so there is no need to call this routine multiple times. Just
call it once at probe.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Viresh Kumar 2012-11-14 14:44:07 +05:30 committed by Linus Walleij
parent 9804049097
commit f92bc45ffd
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/pinctrl/spear/pinctrl-plgpio.c
View File

@ -213,7 +213,7 @@ static int plgpio_request(struct gpio_chip *chip, unsigned offset)
return ret; return ret;
if (!IS_ERR(plgpio->clk)) { if (!IS_ERR(plgpio->clk)) {
ret = clk_prepare_enable(plgpio->clk); ret = clk_enable(plgpio->clk);
if (ret) if (ret)
goto err0; goto err0;
} }
@ -244,7 +244,7 @@ static int plgpio_request(struct gpio_chip *chip, unsigned offset)
err1: err1:
if (!IS_ERR(plgpio->clk)) if (!IS_ERR(plgpio->clk))
clk_disable_unprepare(plgpio->clk); clk_disable(plgpio->clk);
err0: err0:
pinctrl_free_gpio(gpio); pinctrl_free_gpio(gpio);
return ret; return ret;
@ -275,7 +275,7 @@ static void plgpio_free(struct gpio_chip *chip, unsigned offset)
disable_clk: disable_clk:
if (!IS_ERR(plgpio->clk)) if (!IS_ERR(plgpio->clk))
clk_disable_unprepare(plgpio->clk); clk_disable(plgpio->clk);
pinctrl_free_gpio(gpio); pinctrl_free_gpio(gpio);
} }
@ -584,10 +584,18 @@ static int __devinit plgpio_probe(struct platform_device *pdev)
plgpio->chip.dev = &pdev->dev; plgpio->chip.dev = &pdev->dev;
plgpio->chip.owner = THIS_MODULE; plgpio->chip.owner = THIS_MODULE;
if (!IS_ERR(plgpio->clk)) {
ret = clk_prepare(plgpio->clk);
if (ret) {
dev_err(&pdev->dev, "clk prepare failed\n");
return ret;
}
}
ret = gpiochip_add(&plgpio->chip); ret = gpiochip_add(&plgpio->chip);
if (ret) { if (ret) {
dev_err(&pdev->dev, "unable to add gpio chip\n"); dev_err(&pdev->dev, "unable to add gpio chip\n");
return ret; goto unprepare_clk;
} }
irq = platform_get_irq(pdev, 0); irq = platform_get_irq(pdev, 0);
@ -629,6 +637,9 @@ remove_gpiochip:
dev_info(&pdev->dev, "Remove gpiochip\n"); dev_info(&pdev->dev, "Remove gpiochip\n");
if (gpiochip_remove(&plgpio->chip)) if (gpiochip_remove(&plgpio->chip))
dev_err(&pdev->dev, "unable to remove gpiochip\n"); dev_err(&pdev->dev, "unable to remove gpiochip\n");
unprepare_clk:
if (!IS_ERR(plgpio->clk))
clk_unprepare(plgpio->clk);
return ret; return ret;
} }