All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: Michael Turquette <mturquette@baylibre.com>,
	Stephen Boyd <sboyd@kernel.org>,
	Claudiu Beznea <claudiu.beznea@microchip.com>,
	Thierry Reding <thierry.reding@gmail.com>,
	Lee Jones <lee.jones@linaro.org>,
	Nicolas Ferre <nicolas.ferre@microchip.com>,
	Alexandre Belloni <alexandre.belloni@bootlin.com>,
	Ludovic Desroches <ludovic.desroches@microchip.com>
Cc: linux-clk@vger.kernel.org,
	Jonathan Cameron <Jonathan.Cameron@Huawei.com>,
	Alexandru Ardelean <aardelean@deviqon.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	kernel@pengutronix.de, linux-pwm@vger.kernel.org
Subject: [PATCH v7 3/6] pwm: atmel: Simplify using devm_clk_get_prepared()
Date: Mon, 10 May 2021 19:41:39 +0200	[thread overview]
Message-ID: <20210510174142.986250-4-u.kleine-koenig@pengutronix.de> (raw)
In-Reply-To: <20210510174142.986250-1-u.kleine-koenig@pengutronix.de>

With devm_clk_get_prepared() caring to unprepare the clock the error
path and remove callback can be simplified accordingly.

Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 drivers/pwm/pwm-atmel.c | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/drivers/pwm/pwm-atmel.c b/drivers/pwm/pwm-atmel.c
index 29b5ad03f715..d08d389c90b3 100644
--- a/drivers/pwm/pwm-atmel.c
+++ b/drivers/pwm/pwm-atmel.c
@@ -424,16 +424,10 @@ static int atmel_pwm_probe(struct platform_device *pdev)
 	if (IS_ERR(atmel_pwm->base))
 		return PTR_ERR(atmel_pwm->base);
 
-	atmel_pwm->clk = devm_clk_get(&pdev->dev, NULL);
+	atmel_pwm->clk = devm_clk_get_prepared(&pdev->dev, NULL);
 	if (IS_ERR(atmel_pwm->clk))
 		return PTR_ERR(atmel_pwm->clk);
 
-	ret = clk_prepare(atmel_pwm->clk);
-	if (ret) {
-		dev_err(&pdev->dev, "failed to prepare PWM clock\n");
-		return ret;
-	}
-
 	atmel_pwm->chip.dev = &pdev->dev;
 	atmel_pwm->chip.ops = &atmel_pwm_ops;
 	atmel_pwm->chip.of_xlate = of_pwm_xlate_with_flags;
@@ -443,16 +437,12 @@ static int atmel_pwm_probe(struct platform_device *pdev)
 	ret = pwmchip_add(&atmel_pwm->chip);
 	if (ret < 0) {
 		dev_err(&pdev->dev, "failed to add PWM chip %d\n", ret);
-		goto unprepare_clk;
+		return ret;
 	}
 
 	platform_set_drvdata(pdev, atmel_pwm);
 
 	return ret;
-
-unprepare_clk:
-	clk_unprepare(atmel_pwm->clk);
-	return ret;
 }
 
 static int atmel_pwm_remove(struct platform_device *pdev)
@@ -461,7 +451,6 @@ static int atmel_pwm_remove(struct platform_device *pdev)
 
 	pwmchip_remove(&atmel_pwm->chip);
 
-	clk_unprepare(atmel_pwm->clk);
 	mutex_destroy(&atmel_pwm->isr_lock);
 
 	return 0;
-- 
2.30.2


  parent reply	other threads:[~2021-05-10 17:42 UTC|newest]

Thread overview: 75+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-10 17:41 [PATCH v7 0/6] clk: provide new devm helpers for prepared and enabled clocks Uwe Kleine-König
2021-05-10 17:41 ` Uwe Kleine-König
2021-05-10 17:41 ` [PATCH v7 1/6] clk: generalize devm_clk_get() a bit Uwe Kleine-König
2021-05-10 17:41   ` Uwe Kleine-König
2021-05-10 17:41 ` [PATCH v7 2/6] clk: Provide new devm_clk_helpers for prepared and enabled clocks Uwe Kleine-König
2021-05-10 17:41   ` Uwe Kleine-König
2021-05-10 17:41 ` Uwe Kleine-König [this message]
2021-05-10 17:41 ` [PATCH v7 4/6] rtc: at91sam9: Simplify using devm_clk_get_enabled() Uwe Kleine-König
2021-05-10 17:41   ` Uwe Kleine-König
2021-05-10 17:41 ` [PATCH v7 5/6] i2c: imx: " Uwe Kleine-König
2021-05-10 17:41   ` Uwe Kleine-König
2021-05-10 17:41 ` [PATCH v7 6/6] spi: davinci: " Uwe Kleine-König
2021-05-11  7:58 ` [PATCH v7 0/6] clk: provide new devm helpers for prepared and enabled clocks Alexandru Ardelean
2021-05-11  7:58   ` Alexandru Ardelean
2021-05-24 11:09 ` Uwe Kleine-König
2021-05-24 11:09   ` Uwe Kleine-König
2021-06-09 20:21 ` [PULL] Add variants of devm_clk_get for prepared and enabled clocks " Uwe Kleine-König
2021-06-25 17:14   ` Uwe Kleine-König
2021-06-25 17:14     ` Uwe Kleine-König
2021-07-05  8:01     ` Uwe Kleine-König
2021-07-05  8:01       ` Uwe Kleine-König
2021-07-22  6:06       ` Uwe Kleine-König
2021-07-22  6:06         ` Uwe Kleine-König
2021-07-22  7:40         ` Wolfram Sang
2021-07-22  7:40           ` Wolfram Sang
2021-07-22  8:18           ` Uwe Kleine-König
2021-07-22  8:18             ` Uwe Kleine-König
2021-07-22 12:07             ` Wolfram Sang
2021-07-22 12:07               ` Wolfram Sang
     [not found]               ` <CAHp75VfC=s12Unw3+Cn0ag71mM5i90=Jbwj4nYwB5cPKiUTRSA@mail.gmail.com>
2021-07-23  9:13                 ` Uwe Kleine-König
2021-07-23  9:13                   ` Uwe Kleine-König
2021-07-26  9:18                   ` Claudiu.Beznea
2021-07-26  9:18                     ` Claudiu.Beznea
2021-07-26  9:52                     ` Andy Shevchenko
2021-07-26  9:52                       ` Andy Shevchenko
2021-07-26 12:32                       ` Wolfram Sang
2021-07-26 12:32                         ` Wolfram Sang
2021-07-26 13:28                         ` Andy Shevchenko
2021-07-26 13:28                           ` Andy Shevchenko
2021-07-26 17:40                           ` Wolfram Sang
2021-07-26 17:40                             ` Wolfram Sang
2021-07-28 20:25                     ` About clk maintainership [Was: Re: [PULL] Add variants of devm_clk_get for prepared and enabled clocks enabled clocks] Uwe Kleine-König
2021-07-28 20:25                       ` Uwe Kleine-König
2021-07-28 20:40                       ` Russell King (Oracle)
2021-07-28 20:40                         ` Russell King (Oracle)
2021-07-31  7:41                         ` Stephen Boyd
2021-07-31  7:41                           ` Stephen Boyd
2021-07-31  8:07                           ` Andy Shevchenko
2021-07-31  8:07                             ` Andy Shevchenko
2021-07-31 12:00                           ` Uwe Kleine-König
2021-07-31 12:00                             ` Uwe Kleine-König
2021-08-02  9:36                             ` Jonathan Cameron
2021-08-02  9:36                               ` Jonathan Cameron
2021-08-02  9:48                             ` Russell King (Oracle)
2021-08-02  9:48                               ` Russell King (Oracle)
2021-08-02 15:27                               ` Uwe Kleine-König
2021-08-02 15:27                                 ` Uwe Kleine-König
2021-08-02 16:38                                 ` Russell King (Oracle)
2021-08-02 16:38                                   ` Russell King (Oracle)
2021-08-02 17:13                                   ` Andy Shevchenko
2021-08-02 17:13                                     ` Andy Shevchenko
2021-08-02 20:28                                     ` Russell King (Oracle)
2021-08-02 20:28                                       ` Russell King (Oracle)
2021-08-03  8:11                                   ` Stephen Boyd
2021-08-03  8:11                                     ` Stephen Boyd
2021-08-03 10:40                                     ` Uwe Kleine-König
2021-08-03 10:40                                       ` Uwe Kleine-König
2021-08-06  0:26                                       ` Stephen Boyd
2021-08-06  0:26                                         ` Stephen Boyd
2021-09-14 13:22                                         ` Uwe Kleine-König
2021-09-14 13:22                                           ` Uwe Kleine-König
2021-09-14 13:52                                           ` Mark Brown
2021-09-14 13:52                                             ` Mark Brown
2021-08-03  7:44                               ` Stephen Boyd
2021-08-03  7:44                                 ` Stephen Boyd

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210510174142.986250-4-u.kleine-koenig@pengutronix.de \
    --to=u.kleine-koenig@pengutronix.de \
    --cc=Jonathan.Cameron@Huawei.com \
    --cc=aardelean@deviqon.com \
    --cc=akpm@linux-foundation.org \
    --cc=alexandre.belloni@bootlin.com \
    --cc=claudiu.beznea@microchip.com \
    --cc=kernel@pengutronix.de \
    --cc=lee.jones@linaro.org \
    --cc=linux-clk@vger.kernel.org \
    --cc=linux-pwm@vger.kernel.org \
    --cc=ludovic.desroches@microchip.com \
    --cc=mturquette@baylibre.com \
    --cc=nicolas.ferre@microchip.com \
    --cc=sboyd@kernel.org \
    --cc=thierry.reding@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.