openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

OMAP: omap_device: device register functions now take platform_device pointer 

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>
This commit is contained in:
Kevin Hilman 2011-07-21 14:47:53 -07:00
parent 3528c58eb9
commit bfae4f8ffa
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
arch/arm/plat-omap/omap_device.c
View File

@ -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 @@ struct platform_device *omap_device_build_ss(const char *pdev_name, int pdev_id,
* 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;
}
@ -638,13 +638,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);
}