diff options
Diffstat (limited to 'arch/sparc/kernel/of_device_32.c')
| -rw-r--r-- | arch/sparc/kernel/of_device_32.c | 21 | 
1 files changed, 5 insertions, 16 deletions
diff --git a/arch/sparc/kernel/of_device_32.c b/arch/sparc/kernel/of_device_32.c index 331de91ad2b..75fc9d5cd7e 100644 --- a/arch/sparc/kernel/of_device_32.c +++ b/arch/sparc/kernel/of_device_32.c @@ -424,7 +424,7 @@ build_resources:  	build_device_resources(op, parent);  	op->dev.parent = parent; -	op->dev.bus = &of_platform_bus_type; +	op->dev.bus = &platform_bus_type;  	if (!parent)  		dev_set_name(&op->dev, "root");  	else @@ -452,30 +452,19 @@ static void __init scan_tree(struct device_node *dp, struct device *parent)  	}  } -static void __init scan_of_devices(void) +static int __init scan_of_devices(void)  {  	struct device_node *root = of_find_node_by_path("/");  	struct of_device *parent;  	parent = scan_one_device(root, NULL);  	if (!parent) -		return; +		return 0;  	scan_tree(root->child, &parent->dev); +	return 0;  } - -static int __init of_bus_driver_init(void) -{ -	int err; - -	err = of_bus_type_init(&of_platform_bus_type, "of"); -	if (!err) -		scan_of_devices(); - -	return err; -} - -postcore_initcall(of_bus_driver_init); +postcore_initcall(scan_of_devices);  static int __init of_debug(char *str)  {  |