From: Kevin Hilman <khilman@ti.com>
To: linux-omap@vger.kernel.org, Paul Walmsley <paul@pwsan.com>,
Grant Likely <grant.likely@secretlab.ca>
Cc: "G. Manjunath Kondaiah" <manjugk@ti.com>,
linux-arm-kernel@lists.infradead.org,
devicetree-discuss@lists.ozlabs.org, Felipe Balbi <balbi@ti.com>
Subject: [PATCH] OMAP: omap_device: replace _find_by_pdev() with to_omap_device()
Date: Thu, 21 Jul 2011 16:52:11 -0700 [thread overview]
Message-ID: <1311292338-11830-2-git-send-email-khilman@ti.com> (raw)
In-Reply-To: <1311292338-11830-1-git-send-email-khilman@ti.com>
The omap_device layer currently has two ways of getting an omap_device
pointer from a platform_device pointer.
Replace current usage of _find_by_pdev() with to_omap_device() since
to_omap_device() is more familiar to the existing to_platform_device()
used when getting a platform_device pointer from a struct device pointer.
Cc: Felipe Balbi <balbi@ti.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
---
Paul, please consider this minor cleanup for the v3.1 merge window.
Applies to v3.0-c6.
arch/arm/plat-omap/omap_device.c | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/arch/arm/plat-omap/omap_device.c b/arch/arm/plat-omap/omap_device.c
index 49fc0df..c8b9cd1 100644
--- a/arch/arm/plat-omap/omap_device.c
+++ b/arch/arm/plat-omap/omap_device.c
@@ -236,11 +236,6 @@ static int _omap_device_deactivate(struct omap_device *od, u8 ignore_lat)
return 0;
}
-static inline struct omap_device *_find_by_pdev(struct platform_device *pdev)
-{
- return container_of(pdev, struct omap_device, pdev);
-}
-
/**
* _add_optional_clock_clkdev - Add clkdev entry for hwmod optional clocks
* @od: struct omap_device *od
@@ -316,7 +311,7 @@ u32 omap_device_get_context_loss_count(struct platform_device *pdev)
struct omap_device *od;
u32 ret = 0;
- od = _find_by_pdev(pdev);
+ od = to_omap_device(pdev);
if (od->hwmods_cnt)
ret = omap_hwmod_get_context_loss_count(od->hwmods[0]);
@@ -611,7 +606,7 @@ int omap_device_enable(struct platform_device *pdev)
int ret;
struct omap_device *od;
- od = _find_by_pdev(pdev);
+ od = to_omap_device(pdev);
if (od->_state == OMAP_DEVICE_STATE_ENABLED) {
WARN(1, "omap_device: %s.%d: %s() called from invalid state %d\n",
@@ -650,7 +645,7 @@ int omap_device_idle(struct platform_device *pdev)
int ret;
struct omap_device *od;
- od = _find_by_pdev(pdev);
+ od = to_omap_device(pdev);
if (od->_state != OMAP_DEVICE_STATE_ENABLED) {
WARN(1, "omap_device: %s.%d: %s() called from invalid state %d\n",
@@ -681,7 +676,7 @@ int omap_device_shutdown(struct platform_device *pdev)
int ret, i;
struct omap_device *od;
- od = _find_by_pdev(pdev);
+ od = to_omap_device(pdev);
if (od->_state != OMAP_DEVICE_STATE_ENABLED &&
od->_state != OMAP_DEVICE_STATE_IDLE) {
@@ -722,7 +717,7 @@ int omap_device_align_pm_lat(struct platform_device *pdev,
int ret = -EINVAL;
struct omap_device *od;
- od = _find_by_pdev(pdev);
+ od = to_omap_device(pdev);
if (new_wakeup_lat_limit == od->dev_wakeup_lat)
return 0;
--
1.7.6
next prev parent reply other threads:[~2011-07-21 23:52 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-21 23:52 [RFC/PATCH 0/7] decouple platform_device from omap_device Kevin Hilman
2011-07-21 23:52 ` Kevin Hilman [this message]
2011-07-22 8:53 ` [PATCH] OMAP: omap_device: replace _find_by_pdev() with to_omap_device() Felipe Balbi
2011-07-21 23:52 ` [RFC/PATCH 1/7] OMAP: omap_device: replace debug/warning/error prints with dev_* macros Kevin Hilman
2011-07-21 23:52 ` [RFC/PATCH 2/7] OMAP3: beagle: don't touch omap_device internals Kevin Hilman
2011-07-22 8:57 ` Felipe Balbi
2011-07-28 5:53 ` Nishanth Menon
2011-07-28 10:10 ` Russell King - ARM Linux
2011-07-28 12:57 ` Cousson, Benoit
2011-07-28 12:59 ` Felipe Balbi
2011-07-28 13:31 ` Menon, Nishanth
2011-07-29 13:49 ` Nishanth Menon
2011-07-29 14:05 ` Felipe Balbi
2011-07-29 23:07 ` Menon, Nishanth
2011-08-01 8:52 ` Felipe Balbi
2011-07-28 8:36 ` Jean Pihet
2011-07-28 8:40 ` Jean Pihet
2011-07-21 23:52 ` [RFC/PATCH 3/7] OMAP: McBSP: use existing macros for converting between devices Kevin Hilman
2011-07-22 8:58 ` Felipe Balbi
2011-07-22 12:32 ` Sergei Shtylyov
2011-07-22 20:19 ` Kevin Hilman
2011-07-21 23:52 ` [RFC/PATCH 4/7] OMAP: omap_device: remove internal functions from omap_device.h Kevin Hilman
2011-07-21 23:52 ` [RFC/PATCH 5/7] OMAP: omap_device: when building return platform_device instead of omap_device Kevin Hilman
2011-07-21 23:52 ` [RFC/PATCH 6/7] OMAP: omap_device: device register functions now take platform_device pointer Kevin Hilman
2011-07-22 6:16 ` Grant Likely
2011-07-21 23:52 ` [RFC/PATCH 7/7] WIP: HACK/RFC: omap_device: begin to decouple platform_device from omap_device Kevin Hilman
2011-07-22 2:20 ` Grant Likely
2011-07-30 12:03 ` Russell King - ARM Linux
2011-07-31 2:58 ` Grant Likely
2011-07-31 15:05 ` Russell King - ARM Linux
2011-08-01 15:42 ` Kevin Hilman
2011-08-01 15:44 ` Grant Likely
2011-08-01 18:50 ` Felipe Balbi
2011-08-01 20:07 ` Russell King - ARM Linux
2011-08-01 22:11 ` Kevin Hilman
2011-08-01 22:55 ` Felipe Balbi
2011-08-01 23:09 ` Russell King - ARM Linux
2011-08-02 0:00 ` Grant Likely
2011-07-27 14:04 ` [RFC/PATCH 0/7] " G, Manjunath Kondaiah
2011-07-27 21:45 ` Hilman, Kevin
2011-07-28 4:50 ` G, Manjunath Kondaiah
2011-07-29 23:59 ` Kevin Hilman
-- strict thread matches above, loose matches on Subject: below --
2011-07-06 19:26 [PATCH] OMAP: omap_device: replace _find_by_pdev() with to_omap_device() Kevin Hilman
2011-07-06 22:18 ` Felipe Balbi
2011-07-09 22:40 ` Paul Walmsley
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=1311292338-11830-2-git-send-email-khilman@ti.com \
--to=khilman@ti.com \
--cc=balbi@ti.com \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=grant.likely@secretlab.ca \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=manjugk@ti.com \
--cc=paul@pwsan.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: 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;
as well as URLs for NNTP newsgroup(s).