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, linux-arm-kernel@lists.infradead.org, kernel@pengutronix.de, Fabio Estevam <festevam@gmail.com>, NXP Linux Team <linux-imx@nxp.com>, linux-i2c@vger.kernel.org, Wolfram Sang <wsa@kernel.org>, Oleksij Rempel <o.rempel@pengutronix.de> Subject: [PATCH v5 5/6] i2c: imx: Simplify using devm_clk_get_enableded() Date: Thu, 22 Apr 2021 08:57:25 +0200 [thread overview] Message-ID: <20210422065726.1646742-6-u.kleine-koenig@pengutronix.de> (raw) In-Reply-To: <20210422065726.1646742-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 b80fdc1f0092..d6594358cf83 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, linux-arm-kernel@lists.infradead.org, kernel@pengutronix.de, Fabio Estevam <festevam@gmail.com>, NXP Linux Team <linux-imx@nxp.com>, linux-i2c@vger.kernel.org, Wolfram Sang <wsa@kernel.org>, Oleksij Rempel <o.rempel@pengutronix.de> Subject: [PATCH v5 5/6] i2c: imx: Simplify using devm_clk_get_enableded() Date: Thu, 22 Apr 2021 08:57:25 +0200 [thread overview] Message-ID: <20210422065726.1646742-6-u.kleine-koenig@pengutronix.de> (raw) In-Reply-To: <20210422065726.1646742-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 b80fdc1f0092..d6594358cf83 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-04-22 6:57 UTC|newest] Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-04-22 6:57 [PATCH v5 0/6] clk: provide new devm helpers for prepared and enabled clocks Uwe Kleine-König 2021-04-22 6:57 ` Uwe Kleine-König 2021-04-22 6:57 ` [PATCH v5 1/6] clk: generalize devm_clk_get() a bit Uwe Kleine-König 2021-04-22 6:57 ` Uwe Kleine-König 2021-04-22 6:57 ` [PATCH v5 2/6] clk: Provide new devm_clk_helpers for prepared and enabled clocks Uwe Kleine-König 2021-04-22 6:57 ` Uwe Kleine-König 2021-04-22 6:57 ` [PATCH v5 3/6] pwm: atmel: Simplify using devm_clk_get_prepared() Uwe Kleine-König 2021-04-22 6:57 ` Uwe Kleine-König 2021-04-22 6:57 ` [PATCH v5 4/6] rtc: at91sma9: Simplify using devm_clk_get_enabled() Uwe Kleine-König 2021-04-22 6:57 ` Uwe Kleine-König 2021-04-22 8:01 ` Alexander Dahl 2021-04-22 8:01 ` Alexander Dahl 2021-04-22 15:39 ` Uwe Kleine-König 2021-04-22 15:39 ` Uwe Kleine-König 2021-04-22 6:57 ` Uwe Kleine-König [this message] 2021-04-22 6:57 ` [PATCH v5 5/6] i2c: imx: Simplify using devm_clk_get_enableded() Uwe Kleine-König 2021-04-22 16:35 ` Uwe Kleine-König 2021-04-22 16:35 ` Uwe Kleine-König 2021-04-22 6:57 ` [PATCH v5 6/6] spi: davinci: Simplify using devm_clk_get_enabled() Uwe Kleine-König 2021-04-22 6:57 ` Uwe Kleine-König
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=20210422065726.1646742-6-u.kleine-koenig@pengutronix.de \ --to=u.kleine-koenig@pengutronix.de \ --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.