From: Shubhrajyoti D <shubhrajyoti-l0cyMroinI0@public.gmane.org>
To: linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
ben-linux-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org,
tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org,
w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org,
Shubhrajyoti D <shubhrajyoti-l0cyMroinI0@public.gmane.org>,
Kevin Hilman <khilman-l0cyMroinI0@public.gmane.org>,
Rajendra Nayak <rnayak-l0cyMroinI0@public.gmane.org>
Subject: [PATCHv7 06/18] I2C: OMAP: Fix the mismatch of pm_runtime enable and disable
Date: Wed, 11 Apr 2012 16:42:44 +0530 [thread overview]
Message-ID: <1334142776-10583-7-git-send-email-shubhrajyoti@ti.com> (raw)
In-Reply-To: <1334142776-10583-1-git-send-email-shubhrajyoti-l0cyMroinI0@public.gmane.org>
Currently the i2c driver calls the pm_runtime_enable and never
the disable. This may cause a warning when pm_runtime_enable
checks for the count match.Attempting to fix the same by calling
pm_runtime_disable in the error and the remove path.
Cc: Kevin Hilman <khilman-l0cyMroinI0@public.gmane.org>
Cc: Rajendra Nayak <rnayak-l0cyMroinI0@public.gmane.org>
Signed-off-by: Shubhrajyoti D <shubhrajyoti-l0cyMroinI0@public.gmane.org>
---
drivers/i2c/busses/i2c-omap.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 2769f67..3670088 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -1124,6 +1124,7 @@ err_unuse_clocks:
omap_i2c_write_reg(dev, OMAP_I2C_CON_REG, 0);
pm_runtime_put(dev->dev);
iounmap(dev->base);
+ pm_runtime_disable(&pdev->dev);
err_free_mem:
platform_set_drvdata(pdev, NULL);
kfree(dev);
@@ -1144,6 +1145,7 @@ omap_i2c_remove(struct platform_device *pdev)
free_irq(dev->irq, dev);
i2c_del_adapter(&dev->adapter);
omap_i2c_write_reg(dev, OMAP_I2C_CON_REG, 0);
+ pm_runtime_disable(&pdev->dev);
iounmap(dev->base);
kfree(dev);
mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
--
1.7.4.1
next prev parent reply other threads:[~2012-04-11 11:12 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-11 11:12 [PATCHv7 00/18] I2C updates Shubhrajyoti D
2012-04-11 11:12 ` [PATCHv7 01/18] I2C: OMAP: make omap_i2c_unidle/idle functions depend on CONFIG_PM_RUNTIME Shubhrajyoti D
2012-04-11 11:32 ` Felipe Balbi
2012-04-11 11:59 ` Shubhrajyoti Datta
2012-04-11 12:00 ` Felipe Balbi
2012-04-11 11:12 ` [PATCHv7 02/18] I2C: OMAP: Remove reset at init Shubhrajyoti D
2012-04-11 11:12 ` [PATCHv7 03/18] I2C: OMAP: Recover from Bus Busy condition Shubhrajyoti D
2012-04-11 11:12 ` [PATCHv7 05/18] I2C: OMAP: Fix the interrupt clearing in OMAP4 Shubhrajyoti D
2012-04-11 11:12 ` [PATCHv7 08/18] I2C: OMAP: Fix the error handling Shubhrajyoti D
2012-04-11 11:12 ` [PATCHv7 10/18] I2C: OMAP: Don't check if wait_for_completion_timeout() returns less than zero Shubhrajyoti D
2012-04-11 11:12 ` [PATCHv7 11/18] I2C: OMAP: use devm_* functions Shubhrajyoti D
2012-04-11 11:34 ` Felipe Balbi
2012-04-11 11:56 ` Shubhrajyoti
2012-04-11 11:12 ` [PATCHv7 15/18] I2C: OMAP: make the read ready processing a separate function Shubhrajyoti D
[not found] ` <1334142776-10583-1-git-send-email-shubhrajyoti-l0cyMroinI0@public.gmane.org>
2012-04-11 11:12 ` [PATCHv7 04/18] I2C: OMAP: I2C register restore only if context is lost Shubhrajyoti D
2012-04-11 11:12 ` Shubhrajyoti D [this message]
2012-04-11 11:12 ` [PATCHv7 07/18] I2C: OMAP: Optimise the remove code Shubhrajyoti D
2012-04-11 11:12 ` [PATCHv7 09/18] I2C: OMAP: Correct I2C revision for OMAP3 Shubhrajyoti D
2012-04-11 11:12 ` [PATCHv7 12/18] I2C: OMAP: Fix the crash in i2c remove Shubhrajyoti D
2012-04-11 11:12 ` [PATCHv7 13/18] I2C: OMAP: Handle error check for pm runtime Shubhrajyoti D
2012-04-11 11:12 ` [PATCHv7 14/18] I2C: OMAP: Use SET_RUNTIME_PM_OPS Shubhrajyoti D
[not found] ` <1334142776-10583-15-git-send-email-shubhrajyoti-l0cyMroinI0@public.gmane.org>
2012-04-11 11:35 ` Felipe Balbi
2012-04-11 12:09 ` Hebbar, Gururaja
2012-04-11 12:10 ` Felipe Balbi
[not found] ` <20120411121056.GJ12064-S8G//mZuvNWo5Im9Ml3/Zg@public.gmane.org>
2012-04-11 12:13 ` Hebbar, Gururaja
[not found] ` <20120411113537.GG12064-S8G//mZuvNWo5Im9Ml3/Zg@public.gmane.org>
2012-04-11 13:10 ` Shubhrajyoti Datta
2012-04-11 11:12 ` [PATCHv7 16/18] I2C: OMAP: fix missing handling of errata I2C_OMAP3_1P153 Shubhrajyoti D
2012-04-11 11:12 ` [PATCHv7 17/18] I2C: OMAP: Do not set the XUDF if the underflow is not reached Shubhrajyoti D
2012-04-11 11:12 ` [PATCHv7 18/18] I2C: OMAP: Rename the 1p153 to the erratum id i462 Shubhrajyoti D
-- strict thread matches above, loose matches on Subject: below --
2012-04-11 10:52 [PATCHv7 00/18] I2C updates Shubhrajyoti D
[not found] ` <1334141549-8288-1-git-send-email-shubhrajyoti-l0cyMroinI0@public.gmane.org>
2012-04-11 10:52 ` [PATCHv7 06/18] I2C: OMAP: Fix the mismatch of pm_runtime enable and disable Shubhrajyoti D
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=1334142776-10583-7-git-send-email-shubhrajyoti@ti.com \
--to=shubhrajyoti-l0cymroini0@public.gmane.org \
--cc=ben-linux-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org \
--cc=khilman-l0cyMroinI0@public.gmane.org \
--cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
--cc=linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=rnayak-l0cyMroinI0@public.gmane.org \
--cc=tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org \
--cc=w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox