From: Ulf Hansson <ulf.hansson@linaro.org> To: Wolfram Sang <wsa@the-dreams.de>, linux-i2c@vger.kernel.org Cc: Jarkko Nikula <jarkko.nikula@linux.intel.com>, Andy Shevchenko <andriy.shevchenko@linux.intel.com>, Mika Westerberg <mika.westerberg@linux.intel.com>, John Stultz <john.stultz@linaro.org>, Guodong Xu <guodong.xu@linaro.org>, linux-arm-kernel@lists.infradead.org, Ulf Hansson <ulf.hansson@linaro.org> Subject: [PATCH 08/10] i2c: designware-platdrv: Check return value from clk_prepare_enable() Date: Tue, 14 Jun 2016 17:07:26 +0200 [thread overview] Message-ID: <1465916848-8207-9-git-send-email-ulf.hansson@linaro.org> (raw) In-Reply-To: <1465916848-8207-1-git-send-email-ulf.hansson@linaro.org> As clk_prepare_enable() can fail, let's not ignore the error in the ->runtime_resume() callback, but instead propagate it. This change decreases the callers of i2c_dw_plat_prepare_clk() down to one, which seems like a justification of removing it. Instead let's call clk_disable_unprepare() directly when needed. Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> --- drivers/i2c/busses/i2c-designware-platdrv.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c index 95a9f4e..2b91af3 100644 --- a/drivers/i2c/busses/i2c-designware-platdrv.c +++ b/drivers/i2c/busses/i2c-designware-platdrv.c @@ -308,25 +308,15 @@ static void dw_i2c_plat_complete(struct device *dev) #endif #ifdef CONFIG_PM -static int i2c_dw_plat_prepare_clk(struct dw_i2c_dev *i_dev, bool prepare) -{ - if (IS_ERR(i_dev->clk)) - return PTR_ERR(i_dev->clk); - - if (prepare) - return clk_prepare_enable(i_dev->clk); - - clk_disable_unprepare(i_dev->clk); - return 0; -} - static int dw_i2c_plat_suspend(struct device *dev) { struct platform_device *pdev = to_platform_device(dev); struct dw_i2c_dev *i_dev = platform_get_drvdata(pdev); i2c_dw_disable(i_dev); - i2c_dw_plat_prepare_clk(i_dev, false); + + if (!IS_ERR(i_dev->clk)) + clk_disable_unprepare(i_dev->clk); return 0; } @@ -335,10 +325,15 @@ static int dw_i2c_plat_resume(struct device *dev) { struct platform_device *pdev = to_platform_device(dev); struct dw_i2c_dev *i_dev = platform_get_drvdata(pdev); + int ret; - i2c_dw_plat_prepare_clk(i_dev, true); - i2c_dw_init(i_dev); + if (!IS_ERR(i_dev->clk)) { + ret = clk_prepare_enable(i_dev->clk); + if (ret) + return ret; + } + i2c_dw_init(i_dev); return 0; } -- 1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: ulf.hansson@linaro.org (Ulf Hansson) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 08/10] i2c: designware-platdrv: Check return value from clk_prepare_enable() Date: Tue, 14 Jun 2016 17:07:26 +0200 [thread overview] Message-ID: <1465916848-8207-9-git-send-email-ulf.hansson@linaro.org> (raw) In-Reply-To: <1465916848-8207-1-git-send-email-ulf.hansson@linaro.org> As clk_prepare_enable() can fail, let's not ignore the error in the ->runtime_resume() callback, but instead propagate it. This change decreases the callers of i2c_dw_plat_prepare_clk() down to one, which seems like a justification of removing it. Instead let's call clk_disable_unprepare() directly when needed. Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> --- drivers/i2c/busses/i2c-designware-platdrv.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c index 95a9f4e..2b91af3 100644 --- a/drivers/i2c/busses/i2c-designware-platdrv.c +++ b/drivers/i2c/busses/i2c-designware-platdrv.c @@ -308,25 +308,15 @@ static void dw_i2c_plat_complete(struct device *dev) #endif #ifdef CONFIG_PM -static int i2c_dw_plat_prepare_clk(struct dw_i2c_dev *i_dev, bool prepare) -{ - if (IS_ERR(i_dev->clk)) - return PTR_ERR(i_dev->clk); - - if (prepare) - return clk_prepare_enable(i_dev->clk); - - clk_disable_unprepare(i_dev->clk); - return 0; -} - static int dw_i2c_plat_suspend(struct device *dev) { struct platform_device *pdev = to_platform_device(dev); struct dw_i2c_dev *i_dev = platform_get_drvdata(pdev); i2c_dw_disable(i_dev); - i2c_dw_plat_prepare_clk(i_dev, false); + + if (!IS_ERR(i_dev->clk)) + clk_disable_unprepare(i_dev->clk); return 0; } @@ -335,10 +325,15 @@ static int dw_i2c_plat_resume(struct device *dev) { struct platform_device *pdev = to_platform_device(dev); struct dw_i2c_dev *i_dev = platform_get_drvdata(pdev); + int ret; - i2c_dw_plat_prepare_clk(i_dev, true); - i2c_dw_init(i_dev); + if (!IS_ERR(i_dev->clk)) { + ret = clk_prepare_enable(i_dev->clk); + if (ret) + return ret; + } + i2c_dw_init(i_dev); return 0; } -- 1.9.1
next prev parent reply other threads:[~2016-06-14 15:08 UTC|newest] Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-06-14 15:07 [PATCH 00/10] i2c: designware-platdrv: Some improvments related to PM Ulf Hansson 2016-06-14 15:07 ` Ulf Hansson 2016-06-14 15:07 ` [PATCH 01/10] i2c: designware-platdrv: Return error in ->probe() when clk ungate fails Ulf Hansson 2016-06-14 15:07 ` Ulf Hansson 2016-06-15 7:04 ` Jarkko Nikula 2016-06-15 7:04 ` Jarkko Nikula 2016-06-14 15:07 ` [PATCH 02/10] i2c: designware-platdrv: Gate clk in error path in ->probe() Ulf Hansson 2016-06-14 15:07 ` Ulf Hansson 2016-06-14 15:22 ` Andy Shevchenko 2016-06-14 15:22 ` Andy Shevchenko 2016-06-15 7:16 ` Ulf Hansson 2016-06-15 7:16 ` Ulf Hansson 2016-06-15 12:07 ` Jarkko Nikula 2016-06-15 12:07 ` Jarkko Nikula 2016-06-20 4:41 ` Ulf Hansson 2016-06-20 4:41 ` Ulf Hansson 2016-06-14 15:07 ` [PATCH 03/10] i2c: designware-platdrv: Unconditionally enable runtime PM Ulf Hansson 2016-06-14 15:07 ` Ulf Hansson 2016-06-15 12:47 ` Jarkko Nikula 2016-06-15 12:47 ` Jarkko Nikula 2016-06-20 5:15 ` Ulf Hansson 2016-06-20 5:15 ` Ulf Hansson 2016-06-14 15:07 ` [PATCH 04/10] i2c: designware-platdrv: Disable autosuspend in error path in ->probe() Ulf Hansson 2016-06-14 15:07 ` Ulf Hansson 2016-06-14 15:07 ` [PATCH 05/10] i2c: designware-platdrv: Fix clk gating in ->remove() Ulf Hansson 2016-06-14 15:07 ` Ulf Hansson 2016-06-14 15:07 ` [PATCH 06/10] i2c: designware-platdrv: Update runtime PM last busy mark in ->probe() Ulf Hansson 2016-06-14 15:07 ` Ulf Hansson 2016-06-15 13:22 ` Jarkko Nikula 2016-06-15 13:22 ` Jarkko Nikula 2016-06-14 15:07 ` [PATCH 07/10] i2c: designware-platdrv: Re-init the HW when resuming Ulf Hansson 2016-06-14 15:07 ` Ulf Hansson 2016-06-14 15:07 ` Ulf Hansson [this message] 2016-06-14 15:07 ` [PATCH 08/10] i2c: designware-platdrv: Check return value from clk_prepare_enable() Ulf Hansson 2016-06-14 15:07 ` [PATCH 09/10] i2c: designware-platdrv: Simplify code by using dev_get_drvdata() Ulf Hansson 2016-06-14 15:07 ` Ulf Hansson 2016-06-15 11:24 ` Jarkko Nikula 2016-06-15 11:24 ` Jarkko Nikula 2016-06-14 15:07 ` [PATCH 10/10] i2c: designware-platdrv: Rework system PM support Ulf Hansson 2016-06-14 15:07 ` Ulf Hansson 2016-06-14 15:35 ` Andy Shevchenko 2016-06-14 15:35 ` Andy Shevchenko 2016-06-15 7:52 ` Ulf Hansson 2016-06-15 7:52 ` Ulf Hansson 2016-06-14 15:39 ` [PATCH 00/10] i2c: designware-platdrv: Some improvments related to PM Andy Shevchenko 2016-06-14 15:39 ` Andy Shevchenko 2016-06-15 8:16 ` Ulf Hansson 2016-06-15 8:16 ` Ulf Hansson
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=1465916848-8207-9-git-send-email-ulf.hansson@linaro.org \ --to=ulf.hansson@linaro.org \ --cc=andriy.shevchenko@linux.intel.com \ --cc=guodong.xu@linaro.org \ --cc=jarkko.nikula@linux.intel.com \ --cc=john.stultz@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-i2c@vger.kernel.org \ --cc=mika.westerberg@linux.intel.com \ --cc=wsa@the-dreams.de \ /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.