From: Li Zetao <lizetao1@huawei.com> To: <linus.walleij@linaro.org>, <brgl@bgdev.pl>, <andy@kernel.org>, <j-keerthy@ti.com>, <vz@mleia.com>, <thierry.reding@gmail.com>, <u.kleine-koenig@pengutronix.de>, <grygorii.strashko@ti.com>, <ssantosh@kernel.org>, <khilman@kernel.org>, <shubhrajyoti.datta@amd.com>, <srinivas.neeli@amd.com>, <michal.simek@amd.com> Cc: <lizetao1@huawei.com>, <linux-gpio@vger.kernel.org>, <linux-arm-kernel@lists.infradead.org>, <linux-pwm@vger.kernel.org>, <linux-omap@vger.kernel.org> Subject: [PATCH -next 02/11] gpio: davinci: Use helper function devm_clk_get_enabled() Date: Fri, 18 Aug 2023 17:30:09 +0800 [thread overview] Message-ID: <20230818093018.1051434-3-lizetao1@huawei.com> (raw) In-Reply-To: <20230818093018.1051434-1-lizetao1@huawei.com> Since commit 7ef9651e9792 ("clk: Provide new devm_clk helpers for prepared and enabled clocks"), devm_clk_get() and clk_prepare_enable() can now be replaced by devm_clk_get_enabled() when the driver enables (and possibly prepares) the clocks for the whole lifetime of the device. Moreover, it is no longer necessary to unprepare and disable the clocks explicitly. Signed-off-by: Li Zetao <lizetao1@huawei.com> --- drivers/gpio/gpio-davinci.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/drivers/gpio/gpio-davinci.c b/drivers/gpio/gpio-davinci.c index 8db5717bdabe..23b5ae8cf2aa 100644 --- a/drivers/gpio/gpio-davinci.c +++ b/drivers/gpio/gpio-davinci.c @@ -477,7 +477,6 @@ static int davinci_gpio_irq_setup(struct platform_device *pdev) { unsigned gpio, bank; int irq; - int ret; struct clk *clk; u32 binten = 0; unsigned ngpio; @@ -502,21 +501,16 @@ static int davinci_gpio_irq_setup(struct platform_device *pdev) ngpio = pdata->ngpio; - clk = devm_clk_get(dev, "gpio"); + clk = devm_clk_get_enabled(dev, "gpio"); if (IS_ERR(clk)) { dev_err(dev, "Error %ld getting gpio clock\n", PTR_ERR(clk)); return PTR_ERR(clk); } - ret = clk_prepare_enable(clk); - if (ret) - return ret; - if (!pdata->gpio_unbanked) { irq = devm_irq_alloc_descs(dev, -1, 0, ngpio, 0); if (irq < 0) { dev_err(dev, "Couldn't allocate IRQ numbers\n"); - clk_disable_unprepare(clk); return irq; } @@ -525,7 +519,6 @@ static int davinci_gpio_irq_setup(struct platform_device *pdev) chips); if (!irq_domain) { dev_err(dev, "Couldn't register an IRQ domain\n"); - clk_disable_unprepare(clk); return -ENODEV; } } @@ -594,10 +587,8 @@ static int davinci_gpio_irq_setup(struct platform_device *pdev) sizeof(struct davinci_gpio_irq_data), GFP_KERNEL); - if (!irqdata) { - clk_disable_unprepare(clk); + if (!irqdata) return -ENOMEM; - } irqdata->regs = g; irqdata->bank_num = bank; -- 2.34.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
WARNING: multiple messages have this Message-ID (diff)
From: Li Zetao <lizetao1@huawei.com> To: <linus.walleij@linaro.org>, <brgl@bgdev.pl>, <andy@kernel.org>, <j-keerthy@ti.com>, <vz@mleia.com>, <thierry.reding@gmail.com>, <u.kleine-koenig@pengutronix.de>, <grygorii.strashko@ti.com>, <ssantosh@kernel.org>, <khilman@kernel.org>, <shubhrajyoti.datta@amd.com>, <srinivas.neeli@amd.com>, <michal.simek@amd.com> Cc: <lizetao1@huawei.com>, <linux-gpio@vger.kernel.org>, <linux-arm-kernel@lists.infradead.org>, <linux-pwm@vger.kernel.org>, <linux-omap@vger.kernel.org> Subject: [PATCH -next 02/11] gpio: davinci: Use helper function devm_clk_get_enabled() Date: Fri, 18 Aug 2023 17:30:09 +0800 [thread overview] Message-ID: <20230818093018.1051434-3-lizetao1@huawei.com> (raw) In-Reply-To: <20230818093018.1051434-1-lizetao1@huawei.com> Since commit 7ef9651e9792 ("clk: Provide new devm_clk helpers for prepared and enabled clocks"), devm_clk_get() and clk_prepare_enable() can now be replaced by devm_clk_get_enabled() when the driver enables (and possibly prepares) the clocks for the whole lifetime of the device. Moreover, it is no longer necessary to unprepare and disable the clocks explicitly. Signed-off-by: Li Zetao <lizetao1@huawei.com> --- drivers/gpio/gpio-davinci.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/drivers/gpio/gpio-davinci.c b/drivers/gpio/gpio-davinci.c index 8db5717bdabe..23b5ae8cf2aa 100644 --- a/drivers/gpio/gpio-davinci.c +++ b/drivers/gpio/gpio-davinci.c @@ -477,7 +477,6 @@ static int davinci_gpio_irq_setup(struct platform_device *pdev) { unsigned gpio, bank; int irq; - int ret; struct clk *clk; u32 binten = 0; unsigned ngpio; @@ -502,21 +501,16 @@ static int davinci_gpio_irq_setup(struct platform_device *pdev) ngpio = pdata->ngpio; - clk = devm_clk_get(dev, "gpio"); + clk = devm_clk_get_enabled(dev, "gpio"); if (IS_ERR(clk)) { dev_err(dev, "Error %ld getting gpio clock\n", PTR_ERR(clk)); return PTR_ERR(clk); } - ret = clk_prepare_enable(clk); - if (ret) - return ret; - if (!pdata->gpio_unbanked) { irq = devm_irq_alloc_descs(dev, -1, 0, ngpio, 0); if (irq < 0) { dev_err(dev, "Couldn't allocate IRQ numbers\n"); - clk_disable_unprepare(clk); return irq; } @@ -525,7 +519,6 @@ static int davinci_gpio_irq_setup(struct platform_device *pdev) chips); if (!irq_domain) { dev_err(dev, "Couldn't register an IRQ domain\n"); - clk_disable_unprepare(clk); return -ENODEV; } } @@ -594,10 +587,8 @@ static int davinci_gpio_irq_setup(struct platform_device *pdev) sizeof(struct davinci_gpio_irq_data), GFP_KERNEL); - if (!irqdata) { - clk_disable_unprepare(clk); + if (!irqdata) return -ENOMEM; - } irqdata->regs = g; irqdata->bank_num = bank; -- 2.34.1
next prev parent reply other threads:[~2023-08-18 9:31 UTC|newest] Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-08-18 9:30 [PATCH -next 00/11] gpio: Use devm_clk_get_*() helper function to simplify the drivers Li Zetao 2023-08-18 9:30 ` Li Zetao 2023-08-18 9:30 ` [PATCH -next 01/11] gpio: cadence: Use helper function devm_clk_get_enabled() Li Zetao 2023-08-18 9:30 ` Li Zetao 2023-08-18 13:49 ` Andy Shevchenko 2023-08-18 13:49 ` Andy Shevchenko 2023-08-18 9:30 ` Li Zetao [this message] 2023-08-18 9:30 ` [PATCH -next 02/11] gpio: davinci: " Li Zetao 2023-08-18 14:03 ` Andy Shevchenko 2023-08-18 14:03 ` Andy Shevchenko 2023-08-18 9:30 ` [PATCH -next 03/11] gpio: ftgpio010: " Li Zetao 2023-08-18 9:30 ` Li Zetao 2023-08-18 13:47 ` Andy Shevchenko 2023-08-18 13:47 ` Andy Shevchenko 2023-08-18 9:30 ` [PATCH -next 04/11] gpio: lpc18xx: " Li Zetao 2023-08-18 9:30 ` Li Zetao 2023-08-18 14:07 ` Andy Shevchenko 2023-08-18 14:07 ` Andy Shevchenko 2023-08-18 9:30 ` [PATCH -next 05/11] gpio: mb86s7x: Use helper function devm_clk_get_optional_enabled() Li Zetao 2023-08-18 9:30 ` Li Zetao 2023-08-18 14:09 ` Andy Shevchenko 2023-08-18 14:09 ` Andy Shevchenko 2023-08-18 9:30 ` [PATCH -next 06/11] gpio: mvebu: Use helper function devm_clk_get_enabled() Li Zetao 2023-08-18 9:30 ` Li Zetao 2023-08-18 13:55 ` Andy Shevchenko 2023-08-18 13:55 ` Andy Shevchenko 2023-08-18 9:30 ` [PATCH -next 07/11] gpio: mxc: Use helper function devm_clk_get_optional_enabled() Li Zetao 2023-08-18 9:30 ` Li Zetao 2023-08-18 13:59 ` Andy Shevchenko 2023-08-18 13:59 ` Andy Shevchenko 2023-08-21 12:12 ` Bartosz Golaszewski 2023-08-21 12:12 ` Bartosz Golaszewski 2023-08-18 9:30 ` [PATCH -next 08/11] gpio: omap: Use helper function devm_clk_get_prepared() Li Zetao 2023-08-18 9:30 ` Li Zetao 2023-08-18 15:00 ` Andy Shevchenko 2023-08-18 15:00 ` Andy Shevchenko 2023-08-18 9:30 ` [PATCH -next 09/11] gpio: stp-xway: Use helper function devm_clk_get_enabled() Li Zetao 2023-08-18 9:30 ` Li Zetao 2023-08-18 15:11 ` Andy Shevchenko 2023-08-18 15:11 ` Andy Shevchenko 2023-08-18 9:30 ` [PATCH -next 10/11] gpio: xilinx: Use helper function devm_clk_get_optional_enabled() Li Zetao 2023-08-18 9:30 ` Li Zetao 2023-08-18 15:12 ` Andy Shevchenko 2023-08-18 15:12 ` Andy Shevchenko 2023-08-18 9:30 ` [PATCH -next 11/11] gpio: zynq: Use helper function devm_clk_get_enabled() Li Zetao 2023-08-18 9:30 ` Li Zetao 2023-08-18 15:13 ` Andy Shevchenko 2023-08-18 15:13 ` Andy Shevchenko
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=20230818093018.1051434-3-lizetao1@huawei.com \ --to=lizetao1@huawei.com \ --cc=andy@kernel.org \ --cc=brgl@bgdev.pl \ --cc=grygorii.strashko@ti.com \ --cc=j-keerthy@ti.com \ --cc=khilman@kernel.org \ --cc=linus.walleij@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-gpio@vger.kernel.org \ --cc=linux-omap@vger.kernel.org \ --cc=linux-pwm@vger.kernel.org \ --cc=michal.simek@amd.com \ --cc=shubhrajyoti.datta@amd.com \ --cc=srinivas.neeli@amd.com \ --cc=ssantosh@kernel.org \ --cc=thierry.reding@gmail.com \ --cc=u.kleine-koenig@pengutronix.de \ --cc=vz@mleia.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: 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.