From: khilman@ti.com (Kevin Hilman)
To: linux-arm-kernel@lists.infradead.org
Subject: [RFC/PATCH 6/7] OMAP: omap_device: device register functions now take platform_device pointer
Date: Thu, 21 Jul 2011 16:52:17 -0700 [thread overview]
Message-ID: <1311292338-11830-8-git-send-email-khilman@ti.com> (raw)
In-Reply-To: <1311292338-11830-1-git-send-email-khilman@ti.com>
The internal device register functions do not need or use any omap_device
internals, so pass in a platform_device pointer instead of an omap_device
pointer.
Signed-off-by: Kevin Hilman <khilman@ti.com>
---
arch/arm/plat-omap/omap_device.c | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/arch/arm/plat-omap/omap_device.c b/arch/arm/plat-omap/omap_device.c
index 932a7e6..c420b94 100644
--- a/arch/arm/plat-omap/omap_device.c
+++ b/arch/arm/plat-omap/omap_device.c
@@ -94,8 +94,8 @@
#define USE_WAKEUP_LAT 0
#define IGNORE_WAKEUP_LAT 1
-static int omap_device_register(struct omap_device *od);
-static int omap_early_device_register(struct omap_device *od);
+static int omap_device_register(struct platform_device *pdev);
+static int omap_early_device_register(struct platform_device *pdev);
/* Private functions */
@@ -501,9 +501,9 @@ struct platform_device *omap_device_build_ss(const char *pdev_name, int pdev_id,
od->pm_lats_cnt = pm_lats_cnt;
if (is_early_device)
- ret = omap_early_device_register(od);
+ ret = omap_early_device_register(&od->pdev);
else
- ret = omap_device_register(od);
+ ret = omap_device_register(&od->pdev);
for (i = 0; i < oh_cnt; i++) {
hwmods[i]->od = od;
@@ -538,11 +538,11 @@ odbs_exit1:
* platform_early_add_device() on the underlying platform_device.
* Returns 0 by default.
*/
-static int omap_early_device_register(struct omap_device *od)
+static int omap_early_device_register(struct platform_device *pdev)
{
struct platform_device *devices[1];
- devices[0] = &(od->pdev);
+ devices[0] = pdev;
early_platform_add_devices(devices, 1);
return 0;
}
@@ -591,13 +591,13 @@ static struct dev_power_domain omap_device_power_domain = {
* platform_device_register() on the underlying platform_device.
* Returns the return value of platform_device_register().
*/
-static int omap_device_register(struct omap_device *od)
+static int omap_device_register(struct platform_device *pdev)
{
- pr_debug("omap_device: %s: registering\n", od->pdev.name);
+ pr_debug("omap_device: %s: registering\n", pdev->name);
- od->pdev.dev.parent = &omap_device_parent;
- od->pdev.dev.pwr_domain = &omap_device_power_domain;
- return platform_device_register(&od->pdev);
+ pdev->dev.parent = &omap_device_parent;
+ pdev->dev.pwr_domain = &omap_device_power_domain;
+ return platform_device_add(pdev);
}
--
1.7.6
next prev parent reply other threads:[~2011-07-21 23:52 UTC|newest]
Thread overview: 42+ 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 ` [PATCH] OMAP: omap_device: replace _find_by_pdev() with to_omap_device() Kevin Hilman
2011-07-22 8:53 ` 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 ` Kevin Hilman [this message]
2011-07-22 6:16 ` [RFC/PATCH 6/7] OMAP: omap_device: device register functions now take platform_device pointer 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
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-8-git-send-email-khilman@ti.com \
--to=khilman@ti.com \
--cc=linux-arm-kernel@lists.infradead.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;
as well as URLs for NNTP newsgroup(s).