aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorKevin Hilman <khilman@ti.com>2011-07-21 17:14:35 -0400
committerKevin Hilman <khilman@ti.com>2011-09-15 19:35:45 -0400
commita2a28ad9969616fa6d7b243ecf334dc6983992cf (patch)
treeb018bc08c5a5ec35d61696e3dd61a4095ac00d61 /arch
parent47c3e5d8060406d8b3be1b4db91e2543673dd225 (diff)
OMAP: omap_device: remove internal functions from omap_device.h
The *_device_register() functions and the count/fill resources functions are internal to omap_device and do not need to be in the header. Signed-off-by: Kevin Hilman <khilman@ti.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/plat-omap/include/plat/omap_device.h6
-rw-r--r--arch/arm/plat-omap/omap_device.c12
2 files changed, 8 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 ee405b36df4b..61d14b385a91 100644
--- a/arch/arm/plat-omap/include/plat/omap_device.h
+++ b/arch/arm/plat-omap/include/plat/omap_device.h
@@ -88,9 +88,6 @@ int omap_device_shutdown(struct platform_device *pdev);
88 88
89/* Core code interface */ 89/* Core code interface */
90 90
91int omap_device_count_resources(struct omap_device *od);
92int omap_device_fill_resources(struct omap_device *od, struct resource *res);
93
94struct omap_device *omap_device_build(const char *pdev_name, int pdev_id, 91struct omap_device *omap_device_build(const char *pdev_name, int pdev_id,
95 struct omap_hwmod *oh, void *pdata, 92 struct omap_hwmod *oh, void *pdata,
96 int pdata_len, 93 int pdata_len,
@@ -103,9 +100,6 @@ struct omap_device *omap_device_build_ss(const char *pdev_name, int pdev_id,
103 struct omap_device_pm_latency *pm_lats, 100 struct omap_device_pm_latency *pm_lats,
104 int pm_lats_cnt, int is_early_device); 101 int pm_lats_cnt, int is_early_device);
105 102
106int omap_device_register(struct omap_device *od);
107int omap_early_device_register(struct omap_device *od);
108
109void __iomem *omap_device_get_rt_va(struct omap_device *od); 103void __iomem *omap_device_get_rt_va(struct omap_device *od);
110 104
111/* OMAP PM interface */ 105/* OMAP PM interface */
diff --git a/arch/arm/plat-omap/omap_device.c b/arch/arm/plat-omap/omap_device.c
index 142bbd8fa3b2..d3fdf5137e06 100644
--- a/arch/arm/plat-omap/omap_device.c
+++ b/arch/arm/plat-omap/omap_device.c
@@ -94,6 +94,9 @@
94#define USE_WAKEUP_LAT 0 94#define USE_WAKEUP_LAT 0
95#define IGNORE_WAKEUP_LAT 1 95#define IGNORE_WAKEUP_LAT 1
96 96
97static int omap_device_register(struct omap_device *od);
98static int omap_early_device_register(struct omap_device *od);
99
97/* Private functions */ 100/* Private functions */
98 101
99/** 102/**
@@ -339,7 +342,7 @@ u32 omap_device_get_context_loss_count(struct platform_device *pdev)
339 * much memory to allocate before calling 342 * much memory to allocate before calling
340 * omap_device_fill_resources(). Returns the count. 343 * omap_device_fill_resources(). Returns the count.
341 */ 344 */
342int omap_device_count_resources(struct omap_device *od) 345static int omap_device_count_resources(struct omap_device *od)
343{ 346{
344 int c = 0; 347 int c = 0;
345 int i; 348 int i;
@@ -370,7 +373,8 @@ int omap_device_count_resources(struct omap_device *od)
370 * functions to get device resources. Hacking around the existing 373 * functions to get device resources. Hacking around the existing
371 * platform_device code wastes memory. Returns 0. 374 * platform_device code wastes memory. Returns 0.
372 */ 375 */
373int omap_device_fill_resources(struct omap_device *od, struct resource *res) 376static int omap_device_fill_resources(struct omap_device *od,
377 struct resource *res)
374{ 378{
375 int c = 0; 379 int c = 0;
376 int i, r; 380 int i, r;
@@ -534,7 +538,7 @@ odbs_exit1:
534 * platform_early_add_device() on the underlying platform_device. 538 * platform_early_add_device() on the underlying platform_device.
535 * Returns 0 by default. 539 * Returns 0 by default.
536 */ 540 */
537int omap_early_device_register(struct omap_device *od) 541static int omap_early_device_register(struct omap_device *od)
538{ 542{
539 struct platform_device *devices[1]; 543 struct platform_device *devices[1];
540 544
@@ -634,7 +638,7 @@ static struct dev_pm_domain omap_device_pm_domain = {
634 * platform_device_register() on the underlying platform_device. 638 * platform_device_register() on the underlying platform_device.
635 * Returns the return value of platform_device_register(). 639 * Returns the return value of platform_device_register().
636 */ 640 */
637int omap_device_register(struct omap_device *od) 641static int omap_device_register(struct omap_device *od)
638{ 642{
639 pr_debug("omap_device: %s: registering\n", od->pdev.name); 643 pr_debug("omap_device: %s: registering\n", od->pdev.name);
640 644