From 37b7754aab9a6ad7ecbba45c87f8d8a1f81b3bcc Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Mon, 30 Apr 2007 17:43:56 +1000 Subject: [SPARC/64] Rename some functions like PowerPC This is to make the of merge easier. Also rename of_bus_type. Signed-off-by: Stephen Rothwell Acked-by: David S. Miller --- arch/sparc/kernel/of_device.c | 42 +++++++++++++++++++++--------------------- arch/sparc/kernel/time.c | 2 +- 2 files changed, 22 insertions(+), 22 deletions(-) (limited to 'arch/sparc/kernel') diff --git a/arch/sparc/kernel/of_device.c b/arch/sparc/kernel/of_device.c index 0760b8157847..cb21983cff9f 100644 --- a/arch/sparc/kernel/of_device.c +++ b/arch/sparc/kernel/of_device.c @@ -21,7 +21,7 @@ static int of_platform_bus_match(struct device *dev, struct device_driver *drv) return of_match_device(matches, of_dev) != NULL; } -static int of_device_probe(struct device *dev) +static int of_platform_device_probe(struct device *dev) { int error = -ENODEV; struct of_platform_driver *drv; @@ -45,7 +45,7 @@ static int of_device_probe(struct device *dev) return error; } -static int of_device_remove(struct device *dev) +static int of_platform_device_remove(struct device *dev) { struct of_device * of_dev = to_of_device(dev); struct of_platform_driver * drv = to_of_platform_driver(dev->driver); @@ -55,7 +55,7 @@ static int of_device_remove(struct device *dev) return 0; } -static int of_device_suspend(struct device *dev, pm_message_t state) +static int of_platform_device_suspend(struct device *dev, pm_message_t state) { struct of_device * of_dev = to_of_device(dev); struct of_platform_driver * drv = to_of_platform_driver(dev->driver); @@ -66,7 +66,7 @@ static int of_device_suspend(struct device *dev, pm_message_t state) return error; } -static int of_device_resume(struct device * dev) +static int of_platform_device_resume(struct device * dev) { struct of_device * of_dev = to_of_device(dev); struct of_platform_driver * drv = to_of_platform_driver(dev->driver); @@ -87,7 +87,7 @@ static int node_match(struct device *dev, void *data) struct of_device *of_find_device_by_node(struct device_node *dp) { - struct device *dev = bus_find_device(&of_bus_type, NULL, + struct device *dev = bus_find_device(&of_platform_bus_type, NULL, dp, node_match); if (dev) @@ -101,10 +101,10 @@ EXPORT_SYMBOL(of_find_device_by_node); struct bus_type ebus_bus_type = { .name = "ebus", .match = of_platform_bus_match, - .probe = of_device_probe, - .remove = of_device_remove, - .suspend = of_device_suspend, - .resume = of_device_resume, + .probe = of_platform_device_probe, + .remove = of_platform_device_remove, + .suspend = of_platform_device_suspend, + .resume = of_platform_device_resume, }; EXPORT_SYMBOL(ebus_bus_type); #endif @@ -113,23 +113,23 @@ EXPORT_SYMBOL(ebus_bus_type); struct bus_type sbus_bus_type = { .name = "sbus", .match = of_platform_bus_match, - .probe = of_device_probe, - .remove = of_device_remove, - .suspend = of_device_suspend, - .resume = of_device_resume, + .probe = of_platform_device_probe, + .remove = of_platform_device_remove, + .suspend = of_platform_device_suspend, + .resume = of_platform_device_resume, }; EXPORT_SYMBOL(sbus_bus_type); #endif -struct bus_type of_bus_type = { +struct bus_type of_platform_bus_type = { .name = "of", .match = of_platform_bus_match, - .probe = of_device_probe, - .remove = of_device_remove, - .suspend = of_device_suspend, - .resume = of_device_resume, + .probe = of_platform_device_probe, + .remove = of_platform_device_remove, + .suspend = of_platform_device_suspend, + .resume = of_platform_device_resume, }; -EXPORT_SYMBOL(of_bus_type); +EXPORT_SYMBOL(of_platform_bus_type); static inline u64 of_read_addr(const u32 *cell, int size) { @@ -595,7 +595,7 @@ build_resources: build_device_resources(op, parent); op->dev.parent = parent; - op->dev.bus = &of_bus_type; + op->dev.bus = &of_platform_bus_type; if (!parent) strcpy(op->dev.bus_id, "root"); else @@ -639,7 +639,7 @@ static int __init of_bus_driver_init(void) { int err; - err = bus_register(&of_bus_type); + err = bus_register(&of_platform_bus_type); #ifdef CONFIG_PCI if (!err) err = bus_register(&ebus_bus_type); diff --git a/arch/sparc/kernel/time.c b/arch/sparc/kernel/time.c index 7b4612da74a6..f2fdbb3664d3 100644 --- a/arch/sparc/kernel/time.c +++ b/arch/sparc/kernel/time.c @@ -354,7 +354,7 @@ static struct of_platform_driver clock_driver = { /* Probe for the mostek real time clock chip. */ static int __init clock_init(void) { - return of_register_driver(&clock_driver, &of_bus_type); + return of_register_driver(&clock_driver, &of_platform_bus_type); } /* Must be after subsys_initcall() so that busses are probed. Must -- cgit v1.2.3