diff options
| author | Pramod Gurav <pramod.gurav@smartplayin.com> | 2014-08-31 16:51:52 +0530 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2014-09-05 10:34:03 +0200 |
| commit | 02b837ffe033ed3b50787e0f3e4103ea5a34636b (patch) | |
| tree | 51dca3e1e9b23074fb777a1f5ee8e859818c75f1 /drivers/pinctrl/pinctrl-at91.c | |
| parent | 1f81bdc7a08e7aee271a4969f451207fd7946894 (diff) | |
| download | blackbird-op-linux-02b837ffe033ed3b50787e0f3e4103ea5a34636b.tar.gz blackbird-op-linux-02b837ffe033ed3b50787e0f3e4103ea5a34636b.zip | |
pinctrl: at91: Switch to using managed clk_get
This patch switches to using managed version of clk_get and hence
removes clk_put from failure path.
CC: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
CC: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Pramod Gurav <pramod.gurav@smartplayin.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/pinctrl-at91.c')
| -rw-r--r-- | drivers/pinctrl/pinctrl-at91.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c index 03b748ea3810..22b82ad4461c 100644 --- a/drivers/pinctrl/pinctrl-at91.c +++ b/drivers/pinctrl/pinctrl-at91.c @@ -1735,14 +1735,14 @@ static int at91_gpio_probe(struct platform_device *pdev) at91_chip->pioc_virq = irq; at91_chip->pioc_idx = alias_idx; - at91_chip->clock = clk_get(&pdev->dev, NULL); + at91_chip->clock = devm_clk_get(&pdev->dev, NULL); if (IS_ERR(at91_chip->clock)) { dev_err(&pdev->dev, "failed to get clock, ignoring.\n"); goto err; } if (clk_prepare(at91_chip->clock)) - goto clk_prep_err; + goto err; /* enable PIO controller's clock */ if (clk_enable(at91_chip->clock)) { @@ -1805,8 +1805,6 @@ static int at91_gpio_probe(struct platform_device *pdev) clk_err: clk_unprepare(at91_chip->clock); -clk_prep_err: - clk_put(at91_chip->clock); err: dev_err(&pdev->dev, "Failure %i for GPIO %i\n", ret, alias_idx); |
