From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de> To: Michael Turquette <mturquette@baylibre.com>, Stephen Boyd <sboyd@kernel.org>, Oleksij Rempel <linux@rempel-privat.de>, Shawn Guo <shawnguo@kernel.org>, Sascha Hauer <s.hauer@pengutronix.de> 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, Fabio Estevam <festevam@gmail.com>, NXP Linux Team <linux-imx@nxp.com>, linux-i2c@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Wolfram Sang <wsa@kernel.org>, Oleksij Rempel <o.rempel@pengutronix.de> Subject: [PATCH v7 5/6] i2c: imx: Simplify using devm_clk_get_enabled() Date: Mon, 10 May 2021 19:41:41 +0200 [thread overview] Message-ID: <20210510174142.986250-6-u.kleine-koenig@pengutronix.de> (raw) In-Reply-To: <20210510174142.986250-1-u.kleine-koenig@pengutronix.de> devm_clk_get_enabled() returns the clk already (prepared and) enabled and the automatically called cleanup cares for disabling (and unpreparing). So simplify .probe() and .remove() accordingly. Acked-by: Oleksij Rempel <o.rempel@pengutronix.de> Acked-by: Wolfram Sang <wsa@kernel.org> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> --- drivers/i2c/busses/i2c-imx.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c index dc5ca71906db..13241401ad88 100644 --- a/drivers/i2c/busses/i2c-imx.c +++ b/drivers/i2c/busses/i2c-imx.c @@ -1405,16 +1405,10 @@ static int i2c_imx_probe(struct platform_device *pdev) ACPI_COMPANION_SET(&i2c_imx->adapter.dev, ACPI_COMPANION(&pdev->dev)); /* Get I2C clock */ - i2c_imx->clk = devm_clk_get(&pdev->dev, NULL); + i2c_imx->clk = devm_clk_get_enabled(&pdev->dev, NULL); if (IS_ERR(i2c_imx->clk)) return dev_err_probe(&pdev->dev, PTR_ERR(i2c_imx->clk), - "can't get I2C clock\n"); - - ret = clk_prepare_enable(i2c_imx->clk); - if (ret) { - dev_err(&pdev->dev, "can't enable I2C clock, ret=%d\n", ret); - return ret; - } + "can't get prepared I2C clock\n"); /* Init queue */ init_waitqueue_head(&i2c_imx->queue); @@ -1487,7 +1481,6 @@ static int i2c_imx_probe(struct platform_device *pdev) pm_runtime_disable(&pdev->dev); pm_runtime_set_suspended(&pdev->dev); pm_runtime_dont_use_autosuspend(&pdev->dev); - clk_disable_unprepare(i2c_imx->clk); return ret; } @@ -1517,7 +1510,6 @@ static int i2c_imx_remove(struct platform_device *pdev) irq = platform_get_irq(pdev, 0); if (irq >= 0) free_irq(irq, i2c_imx); - clk_disable_unprepare(i2c_imx->clk); pm_runtime_put_noidle(&pdev->dev); pm_runtime_disable(&pdev->dev); -- 2.30.2
WARNING: multiple messages have this Message-ID (diff)
From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de> To: Michael Turquette <mturquette@baylibre.com>, Stephen Boyd <sboyd@kernel.org>, Oleksij Rempel <linux@rempel-privat.de>, Shawn Guo <shawnguo@kernel.org>, Sascha Hauer <s.hauer@pengutronix.de> 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, Fabio Estevam <festevam@gmail.com>, NXP Linux Team <linux-imx@nxp.com>, linux-i2c@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Wolfram Sang <wsa@kernel.org>, Oleksij Rempel <o.rempel@pengutronix.de> Subject: [PATCH v7 5/6] i2c: imx: Simplify using devm_clk_get_enabled() Date: Mon, 10 May 2021 19:41:41 +0200 [thread overview] Message-ID: <20210510174142.986250-6-u.kleine-koenig@pengutronix.de> (raw) In-Reply-To: <20210510174142.986250-1-u.kleine-koenig@pengutronix.de> devm_clk_get_enabled() returns the clk already (prepared and) enabled and the automatically called cleanup cares for disabling (and unpreparing). So simplify .probe() and .remove() accordingly. Acked-by: Oleksij Rempel <o.rempel@pengutronix.de> Acked-by: Wolfram Sang <wsa@kernel.org> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> --- drivers/i2c/busses/i2c-imx.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c index dc5ca71906db..13241401ad88 100644 --- a/drivers/i2c/busses/i2c-imx.c +++ b/drivers/i2c/busses/i2c-imx.c @@ -1405,16 +1405,10 @@ static int i2c_imx_probe(struct platform_device *pdev) ACPI_COMPANION_SET(&i2c_imx->adapter.dev, ACPI_COMPANION(&pdev->dev)); /* Get I2C clock */ - i2c_imx->clk = devm_clk_get(&pdev->dev, NULL); + i2c_imx->clk = devm_clk_get_enabled(&pdev->dev, NULL); if (IS_ERR(i2c_imx->clk)) return dev_err_probe(&pdev->dev, PTR_ERR(i2c_imx->clk), - "can't get I2C clock\n"); - - ret = clk_prepare_enable(i2c_imx->clk); - if (ret) { - dev_err(&pdev->dev, "can't enable I2C clock, ret=%d\n", ret); - return ret; - } + "can't get prepared I2C clock\n"); /* Init queue */ init_waitqueue_head(&i2c_imx->queue); @@ -1487,7 +1481,6 @@ static int i2c_imx_probe(struct platform_device *pdev) pm_runtime_disable(&pdev->dev); pm_runtime_set_suspended(&pdev->dev); pm_runtime_dont_use_autosuspend(&pdev->dev); - clk_disable_unprepare(i2c_imx->clk); return ret; } @@ -1517,7 +1510,6 @@ static int i2c_imx_remove(struct platform_device *pdev) irq = platform_get_irq(pdev, 0); if (irq >= 0) free_irq(irq, i2c_imx); - clk_disable_unprepare(i2c_imx->clk); pm_runtime_put_noidle(&pdev->dev); pm_runtime_disable(&pdev->dev); -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-05-10 17:41 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 ` [PATCH v7 3/6] pwm: atmel: Simplify using devm_clk_get_prepared() Uwe Kleine-König 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 ` Uwe Kleine-König [this message] 2021-05-10 17:41 ` [PATCH v7 5/6] i2c: imx: " 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-6-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=festevam@gmail.com \ --cc=kernel@pengutronix.de \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-clk@vger.kernel.org \ --cc=linux-i2c@vger.kernel.org \ --cc=linux-imx@nxp.com \ --cc=linux@rempel-privat.de \ --cc=mturquette@baylibre.com \ --cc=o.rempel@pengutronix.de \ --cc=s.hauer@pengutronix.de \ --cc=sboyd@kernel.org \ --cc=shawnguo@kernel.org \ --cc=wsa@kernel.org \ /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: linkBe 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.