aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/plat-omap/include/plat/omap_device.h7
-rw-r--r--arch/arm/plat-omap/omap_device.c13
2 files changed, 10 insertions, 10 deletions
diff --git a/arch/arm/plat-omap/include/plat/omap_device.h b/arch/arm/plat-omap/include/plat/omap_device.h
index 51423d2727a5..05f7615b61f0 100644
--- a/arch/arm/plat-omap/include/plat/omap_device.h
+++ b/arch/arm/plat-omap/include/plat/omap_device.h
@@ -100,6 +100,13 @@ struct platform_device *omap_device_build_ss(const char *pdev_name, int pdev_id,
100 struct omap_device_pm_latency *pm_lats, 100 struct omap_device_pm_latency *pm_lats,
101 int pm_lats_cnt, int is_early_device); 101 int pm_lats_cnt, int is_early_device);
102 102
103struct omap_device *omap_device_alloc(struct platform_device *pdev,
104 struct omap_hwmod **ohs, int oh_cnt,
105 struct omap_device_pm_latency *pm_lats,
106 int pm_lats_cnt);
107void omap_device_delete(struct omap_device *od);
108int omap_device_register(struct platform_device *pdev);
109
103void __iomem *omap_device_get_rt_va(struct omap_device *od); 110void __iomem *omap_device_get_rt_va(struct omap_device *od);
104struct device *omap_device_get_by_hwmod_name(const char *oh_name); 111struct device *omap_device_get_by_hwmod_name(const char *oh_name);
105 112
diff --git a/arch/arm/plat-omap/omap_device.c b/arch/arm/plat-omap/omap_device.c
index e8d98693d2dd..f72fafc9e9f4 100644
--- a/arch/arm/plat-omap/omap_device.c
+++ b/arch/arm/plat-omap/omap_device.c
@@ -97,14 +97,7 @@
97#define USE_WAKEUP_LAT 0 97#define USE_WAKEUP_LAT 0
98#define IGNORE_WAKEUP_LAT 1 98#define IGNORE_WAKEUP_LAT 1
99 99
100static int omap_device_register(struct platform_device *pdev);
101static int omap_early_device_register(struct platform_device *pdev); 100static int omap_early_device_register(struct platform_device *pdev);
102static struct omap_device *omap_device_alloc(struct platform_device *pdev,
103 struct omap_hwmod **ohs, int oh_cnt,
104 struct omap_device_pm_latency *pm_lats,
105 int pm_lats_cnt);
106static void omap_device_delete(struct omap_device *od);
107
108 101
109static struct omap_device_pm_latency omap_default_latency[] = { 102static struct omap_device_pm_latency omap_default_latency[] = {
110 { 103 {
@@ -509,7 +502,7 @@ static int omap_device_fill_resources(struct omap_device *od,
509 * 502 *
510 * Returns an struct omap_device pointer or ERR_PTR() on error; 503 * Returns an struct omap_device pointer or ERR_PTR() on error;
511 */ 504 */
512static struct omap_device *omap_device_alloc(struct platform_device *pdev, 505struct omap_device *omap_device_alloc(struct platform_device *pdev,
513 struct omap_hwmod **ohs, int oh_cnt, 506 struct omap_hwmod **ohs, int oh_cnt,
514 struct omap_device_pm_latency *pm_lats, 507 struct omap_device_pm_latency *pm_lats,
515 int pm_lats_cnt) 508 int pm_lats_cnt)
@@ -591,7 +584,7 @@ oda_exit1:
591 return ERR_PTR(ret); 584 return ERR_PTR(ret);
592} 585}
593 586
594static void omap_device_delete(struct omap_device *od) 587void omap_device_delete(struct omap_device *od)
595{ 588{
596 if (!od) 589 if (!od)
597 return; 590 return;
@@ -817,7 +810,7 @@ static struct dev_pm_domain omap_device_pm_domain = {
817 * platform_device_register() on the underlying platform_device. 810 * platform_device_register() on the underlying platform_device.
818 * Returns the return value of platform_device_register(). 811 * Returns the return value of platform_device_register().
819 */ 812 */
820static int omap_device_register(struct platform_device *pdev) 813int omap_device_register(struct platform_device *pdev)
821{ 814{
822 pr_debug("omap_device: %s: registering\n", pdev->name); 815 pr_debug("omap_device: %s: registering\n", pdev->name);
823 816