Commit bfae4f8f authored by Kevin Hilman's avatar Kevin Hilman
Browse files

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: default avatarKevin Hilman <khilman@ti.com>
parent 3528c58e

arch/arm/plat-omap/omap_device.c

+11 −11
Original line number Original line Diff line number Diff line
@@ -94,8 +94,8 @@ 
#define USE_WAKEUP_LAT			0

#define USE_WAKEUP_LAT			0

#define IGNORE_WAKEUP_LAT		1

#define IGNORE_WAKEUP_LAT		1





static int omap_device_register(struct omap_device *od);

static int omap_device_register(struct platform_device *pdev);

static int omap_early_device_register(struct omap_device *od);

static int omap_early_device_register(struct platform_device *pdev);





/* Private functions */

/* 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;

	od->pm_lats_cnt = pm_lats_cnt;





	if (is_early_device)

	if (is_early_device)

		ret = omap_early_device_register(od);

		ret = omap_early_device_register(&od->pdev);

	else

	else

		ret = omap_device_register(od);

		ret = omap_device_register(&od->pdev);





	for (i = 0; i < oh_cnt; i++) {

	for (i = 0; i < oh_cnt; i++) {

		hwmods[i]->od = od;

		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.

 * platform_early_add_device() on the underlying platform_device.

 * Returns 0 by default.

 * 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];

	struct platform_device *devices[1];





	devices[0] = &(od->pdev);

	devices[0] = pdev;

	early_platform_add_devices(devices, 1);

	early_platform_add_devices(devices, 1);

	return 0;

	return 0;

}

}
@@ -638,13 +638,13 @@ static struct dev_pm_domain omap_device_pm_domain = { 
 * platform_device_register() on the underlying platform_device.

 * platform_device_register() on the underlying platform_device.

 * Returns the return value of platform_device_register().

 * 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;

	pdev->dev.parent = &omap_device_parent;

	od->pdev.dev.pm_domain = &omap_device_pm_domain;

	pdev->dev.pm_domain = &omap_device_pm_domain;

	return platform_device_register(&od->pdev);

	return platform_device_register(pdev);

}

}