From: Kevin Hilman <khilman@ti.com> To: linux-omap@vger.kernel.org, Grant Likely <grant.likely@secretlab.ca> Cc: linux-arm-kernel@lists.infradead.org Subject: [PATCH 6/9] OMAP: omap_device: device register functions now take platform_device pointer Date: Fri, 5 Aug 2011 17:19:22 -0700 [thread overview] Message-ID: <1312589965-19416-7-git-send-email-khilman@ti.com> (raw) In-Reply-To: <1312589965-19416-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 ea618b8..351df31 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; } @@ -634,13 +634,13 @@ static struct dev_pm_domain omap_device_pm_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.pm_domain = &omap_device_pm_domain; - return platform_device_register(&od->pdev); + pdev->dev.parent = &omap_device_parent; + pdev->dev.pm_domain = &omap_device_pm_domain; + return platform_device_register(pdev); } -- 1.7.6
WARNING: multiple messages have this Message-ID (diff)
From: khilman@ti.com (Kevin Hilman) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 6/9] OMAP: omap_device: device register functions now take platform_device pointer Date: Fri, 5 Aug 2011 17:19:22 -0700 [thread overview] Message-ID: <1312589965-19416-7-git-send-email-khilman@ti.com> (raw) In-Reply-To: <1312589965-19416-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 ea618b8..351df31 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; } @@ -634,13 +634,13 @@ static struct dev_pm_domain omap_device_pm_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.pm_domain = &omap_device_pm_domain; - return platform_device_register(&od->pdev); + pdev->dev.parent = &omap_device_parent; + pdev->dev.pm_domain = &omap_device_pm_domain; + return platform_device_register(pdev); } -- 1.7.6
next prev parent reply other threads:[~2011-08-06 0:19 UTC|newest] Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-08-06 0:19 [PATCH 0/9] OMAP: omap_device cleanups, decouple platform_device for v3.2 Kevin Hilman 2011-08-06 0:19 ` Kevin Hilman 2011-08-06 0:19 ` [PATCH 1/9] omap: mcbsp: Remove omap device API Kevin Hilman 2011-08-06 0:19 ` Kevin Hilman 2011-08-06 0:19 ` [PATCH 2/9] OMAP: omap_device: replace debug/warning/error prints with dev_* macros Kevin Hilman 2011-08-06 0:19 ` Kevin Hilman 2011-08-06 0:19 ` [PATCH 3/9] OMAP: omap_device: make latency autoadjust messages debug Kevin Hilman 2011-08-06 0:19 ` Kevin Hilman 2011-08-06 0:19 ` [PATCH 4/9] OMAP: omap_device: remove internal functions from omap_device.h Kevin Hilman 2011-08-06 0:19 ` Kevin Hilman 2011-08-06 0:19 ` [PATCH 5/9] OMAP: omap_device: when building return platform_device instead of omap_device Kevin Hilman 2011-08-06 0:19 ` Kevin Hilman 2011-08-06 0:19 ` Kevin Hilman [this message] 2011-08-06 0:19 ` [PATCH 6/9] OMAP: omap_device: device register functions now take platform_device pointer Kevin Hilman 2011-08-06 0:19 ` [PATCH 7/9] OMAP: omap_device: _disable_idle_on_suspend() takes " Kevin Hilman 2011-08-06 0:19 ` Kevin Hilman 2011-08-06 0:19 ` [PATCH 8/9] ARM: platform_device: pdev_archdata: add omap_device pointer Kevin Hilman 2011-08-06 0:19 ` Kevin Hilman 2011-08-06 8:31 ` Grant Likely 2011-08-06 8:31 ` Grant Likely 2011-08-06 0:19 ` [PATCH 9/9] OMAP: omap_device: decouple platform_device from omap_device Kevin Hilman 2011-08-06 0:19 ` Kevin Hilman 2011-08-06 8:33 ` Grant Likely 2011-08-06 8:33 ` Grant Likely
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=1312589965-19416-7-git-send-email-khilman@ti.com \ --to=khilman@ti.com \ --cc=grant.likely@secretlab.ca \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-omap@vger.kernel.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: 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.