of: Merge of_platform_bus_type with platform_bus_type

of_platform_bus was being used in the same manner as the platform_bus. The only difference being that of_platform_bus devices are generated from data in the device tree, and platform_bus devices are usually statically allocated in platform code. Having them separate causes the problem of device drivers having to be registered twice if it was possible for the same device to appear on either bus. This patch removes of_platform_bus_type and registers all of_platform bus devices and drivers on the platform bus instead. A previous patch made the of_device structure an alias for the platform_device structure, and a shim is used to adapt of_platform_drivers to the platform bus. After all of of_platform_bus drivers are converted to be normal platform drivers, the shim code can be removed. Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Acked-by: David S. Miller <davem@davemloft.net>

of: Merge of_platform_bus_type with platform_bus_type
of_platform_bus was being used in the same manner as the platform_bus. The only difference being that of_platform_bus devices are generated from data in the device tree, and platform_bus devices are usually statically allocated in platform code. Having them separate causes the problem of device drivers having to be registered twice if it was possible for the same device to appear on either bus. This patch removes of_platform_bus_type and registers all of_platform bus devices and drivers on the platform bus instead. A previous patch made the of_device structure an alias for the platform_device structure, and a shim is used to adapt of_platform_drivers to the platform bus. After all of of_platform_bus drivers are converted to be normal platform drivers, the shim code can be removed. Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Acked-by: David S. Miller <davem@davemloft.net>
Grant Likely
1 parent 05212157e9
Showing 16 changed files with 102 additions and 103 deletions Side-by-side Diff
arch/microblaze/kernel/of_platform.c
arch/microblaze/kernel/setup.c
arch/powerpc/kernel/dma-swiotlb.c
arch/powerpc/kernel/of_platform.c
arch/powerpc/kernel/setup-common.c
arch/powerpc/platforms/cell/beat_iommu.c
arch/powerpc/platforms/cell/iommu.c
arch/powerpc/sysdev/mv64x60_dev.c
arch/sparc/kernel/of_device_32.c
arch/sparc/kernel/of_device_64.c
arch/sparc/kernel/of_device_common.c
drivers/base/platform.c
drivers/of/device.c
drivers/of/platform.c
include/linux/of_device.h
include/linux/of_platform.h
@@ -26,17 +26,6 @@
 #include <linux/topology.h>
 #include <asm/atomic.h>
  
-struct bus_type of_platform_bus_type = {
-       .uevent	= of_device_uevent,
-};
-EXPORT_SYMBOL(of_platform_bus_type);
-
-static int __init of_bus_driver_init(void)
-{
-	return of_bus_type_init(&of_platform_bus_type, "of_platform");
-}
-postcore_initcall(of_bus_driver_init);
-
 /*
  * The list of OF IDs below is used for matching bus types in the
  * system whose devices are to be exposed as of_platform_devices.
@@ -213,15 +213,9 @@
 	.priority = INT_MAX,
 };
  
-static struct notifier_block dflt_of_bus_notifier = {
-	.notifier_call = dflt_bus_notify,
-	.priority = INT_MAX,
-};
-
 static int __init setup_bus_notifier(void)
 {
 	bus_register_notifier(&platform_bus_type, &dflt_plat_bus_notifier);
-	bus_register_notifier(&of_platform_bus_type, &dflt_of_bus_notifier);
  
 	return 0;
 }
@@ -82,18 +82,10 @@
 	.priority = 0,
 };
  
-static struct notifier_block ppc_swiotlb_of_bus_notifier = {
-	.notifier_call = ppc_swiotlb_bus_notify,
-	.priority = 0,
-};
-
 int __init swiotlb_setup_bus_notifier(void)
 {
 	bus_register_notifier(&platform_bus_type,
 			      &ppc_swiotlb_plat_bus_notifier);
-	bus_register_notifier(&of_platform_bus_type,
-			      &ppc_swiotlb_of_bus_notifier);
-
 	return 0;
 }
@@ -52,18 +52,6 @@
 	{},
 };
  
-struct bus_type of_platform_bus_type = {
-       .uevent	= of_device_uevent,
-};
-EXPORT_SYMBOL(of_platform_bus_type);
-
-static int __init of_bus_driver_init(void)
-{
-	return of_bus_type_init(&of_platform_bus_type, "of_platform");
-}
-
-postcore_initcall(of_bus_driver_init);
-
 static int of_dev_node_match(struct device *dev, void *data)
 {
 	return to_of_device(dev)->dev.of_node == data;
@@ -701,16 +701,9 @@
 	.priority = INT_MAX,
 };
  
-static struct notifier_block ppc_dflt_of_bus_notifier = {
-	.notifier_call = ppc_dflt_bus_notify,
-	.priority = INT_MAX,
-};
-
 static int __init setup_bus_notifier(void)
 {
 	bus_register_notifier(&platform_bus_type, &ppc_dflt_plat_bus_notifier);
-	bus_register_notifier(&of_platform_bus_type, &ppc_dflt_of_bus_notifier);
-
 	return 0;
 }
  
@@ -108,7 +108,7 @@
 	celleb_init_direct_mapping();
 	set_pci_dma_ops(&dma_direct_ops);
 	ppc_md.pci_dma_dev_setup = celleb_pci_dma_dev_setup;
-	bus_register_notifier(&of_platform_bus_type, &celleb_of_bus_notifier);
+	bus_register_notifier(&platform_bus_type, &celleb_of_bus_notifier);
  
 	return 0;
 }
@@ -1204,7 +1204,7 @@
 	/* Register callbacks on OF platform device addition/removal
 	 * to handle linking them to the right DMA operations
 	 */
-	bus_register_notifier(&of_platform_bus_type, &cell_of_bus_notifier);
+	bus_register_notifier(&platform_bus_type, &cell_of_bus_notifier);
  
 	return 0;
 }
@@ -20,12 +20,7 @@
  
 #include <asm/prom.h>
  
-/*
- * These functions provide the necessary setup for the mv64x60 drivers.
- * These drivers are unusual in that they work on both the MIPS and PowerPC
- * architectures.  Because of that, the drivers do not support the normal
- * PowerPC of_platform_bus_type.  They support platform_bus_type instead.
- */
+/* These functions provide the necessary setup for the mv64x60 drivers. */
  
 static struct of_device_id __initdata of_mv64x60_devices[] = {
 	{ .compatible = "marvell,mv64306-devctrl", },
@@ -424,7 +424,7 @@
 	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_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)
 {
@@ -667,7 +667,7 @@
 		op->archdata.irqs[i] = build_one_device_irq(op, parent, op->archdata.irqs[i]);
  
 	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
  
  
  
@@ -695,30 +695,19 @@
 	}
 }
  
-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)
 {
@@ -64,9 +64,6 @@
 	}
 }
  
-struct bus_type of_platform_bus_type;
-EXPORT_SYMBOL(of_platform_bus_type);
-
 static void get_cells(struct device_node *dp, int *addrc, int *sizec)
 {
 	if (addrc)
@@ -636,6 +636,12 @@
 static int platform_uevent(struct device *dev, struct kobj_uevent_env *env)
 {
 	struct platform_device	*pdev = to_platform_device(dev);
+	int rc;
+
+	/* Some devices have extra OF data and an OF-style MODALIAS */
+	rc = of_device_uevent(dev,env);
+	if (rc != -ENODEV)
+		return rc;
  
 	add_uevent_var(env, "MODALIAS=%s%s", PLATFORM_MODULE_PREFIX,
 		(pdev->id_entry) ? pdev->id_entry->name : pdev->name);
@@ -104,6 +104,11 @@
  
 	device_initialize(&ofdev->dev);
  
+	/* name and id have to be set so that the platform bus doesn't get
+	 * confused on matching */
+	ofdev->name = dev_name(&ofdev->dev);
+	ofdev->id = -1;
+
 	/* device_add will assume that this device is on the same node as
 	 * the parent. If there is no parent defined, set the node
 	 * explicitly */
@@ -20,7 +20,55 @@
 #include <linux/of_device.h>
 #include <linux/of_irq.h>
 #include <linux/of_platform.h>
+#include <linux/platform_device.h>
  
+static int platform_driver_probe_shim(struct platform_device *pdev)
+{
+	struct platform_driver *pdrv;
+	struct of_platform_driver *ofpdrv;
+	const struct of_device_id *match;
+
+	pdrv = container_of(pdev->dev.driver, struct platform_driver, driver);
+	ofpdrv = container_of(pdrv, struct of_platform_driver, platform_driver);
+	match = of_match_device(pdev->dev.driver->of_match_table, &pdev->dev);
+	return ofpdrv->probe(pdev, match);
+}
+
+static void platform_driver_shutdown_shim(struct platform_device *pdev)
+{
+	struct platform_driver *pdrv;
+	struct of_platform_driver *ofpdrv;
+
+	pdrv = container_of(pdev->dev.driver, struct platform_driver, driver);
+	ofpdrv = container_of(pdrv, struct of_platform_driver, platform_driver);
+	ofpdrv->shutdown(pdev);
+}
+
+/**
+ * of_register_platform_driver
+ */
+int of_register_platform_driver(struct of_platform_driver *drv)
+{
+	/* setup of_platform_driver to platform_driver adaptors */
+	drv->platform_driver.driver = drv->driver;
+	if (drv->probe)
+		drv->platform_driver.probe = platform_driver_probe_shim;
+	drv->platform_driver.remove = drv->remove;
+	if (drv->shutdown)
+		drv->platform_driver.shutdown = platform_driver_shutdown_shim;
+	drv->platform_driver.suspend = drv->suspend;
+	drv->platform_driver.resume = drv->resume;
+
+	return platform_driver_register(&drv->platform_driver);
+}
+EXPORT_SYMBOL(of_register_platform_driver);
+
+void of_unregister_platform_driver(struct of_platform_driver *drv)
+{
+	platform_driver_unregister(&drv->platform_driver);
+}
+EXPORT_SYMBOL(of_unregister_platform_driver);
+
 #if defined(CONFIG_PPC_DCR)
 #include <asm/dcr.h>
 #endif
  
  
@@ -392,16 +440,29 @@
  
 int of_register_driver(struct of_platform_driver *drv, struct bus_type *bus)
 {
-	drv->driver.bus = bus;
+	/*
+	 * Temporary: of_platform_bus used to be distinct from the platform
+	 * bus.  It isn't anymore, and so drivers on the platform bus need
+	 * to be registered in a special way.
+	 *
+	 * After all of_platform_bus_type drivers are converted to
+	 * platform_drivers, this exception can be removed.
+	 */
+	if (bus == &platform_bus_type)
+		return of_register_platform_driver(drv);
  
 	/* register with core */
+	drv->driver.bus = bus;
 	return driver_register(&drv->driver);
 }
 EXPORT_SYMBOL(of_register_driver);
  
 void of_unregister_driver(struct of_platform_driver *drv)
 {
-	driver_unregister(&drv->driver);
+	if (drv->driver.bus == &platform_bus_type)
+		of_unregister_platform_driver(drv);
+	else
+		driver_unregister(&drv->driver);
 }
 EXPORT_SYMBOL(of_unregister_driver);
  
@@ -548,7 +609,7 @@
 	dev->archdata.dma_mask = 0xffffffffUL;
 #endif
 	dev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
-	dev->dev.bus = &of_platform_bus_type;
+	dev->dev.bus = &platform_bus_type;
  
 	/* We do not fill the DMA ops for platform devices by default.
 	 * This is currently the responsibility of the platform code
@@ -65,6 +65,12 @@
 	return 0;
 }
  
+static inline int of_device_uevent(struct device *dev,
+				   struct kobj_uevent_env *env)
+{
+	return -ENODEV;
+}
+
 #endif /* CONFIG_OF_DEVICE */
  
 #endif /* _LINUX_OF_DEVICE_H */
@@ -17,19 +17,19 @@
 #include <linux/mod_devicetable.h>
 #include <linux/pm.h>
 #include <linux/of_device.h>
+#include <linux/platform_device.h>
  
 /*
- * The of_platform_bus_type is a bus type used by drivers that do not
- * attach to a macio or similar bus but still use OF probing
- * mechanism
+ * of_platform_bus_type isn't it's own bus anymore.  It's now just an alias
+ * for the platform bus.
  */
-extern struct bus_type of_platform_bus_type;
+#define of_platform_bus_type platform_bus_type
  
 extern const struct of_device_id of_default_bus_ids[];
  
 /*
  * An of_platform_driver driver is attached to a basic of_device on
- * the "platform bus" (of_platform_bus_type).
+ * the "platform bus" (platform_bus_type).
  */
 struct of_platform_driver
 {
@@ -42,6 +42,7 @@
 	int	(*shutdown)(struct of_device* dev);
  
 	struct device_driver	driver;
+	struct platform_driver	platform_driver;
 };
 #define	to_of_platform_driver(drv) \
 	container_of(drv,struct of_platform_driver, driver)
@@ -51,14 +52,8 @@
 extern void of_unregister_driver(struct of_platform_driver *drv);
  
 /* Platform drivers register/unregister */
-static inline int of_register_platform_driver(struct of_platform_driver *drv)
-{
-	return of_register_driver(drv, &of_platform_bus_type);
-}
-static inline void of_unregister_platform_driver(struct of_platform_driver *drv)
-{
-	of_unregister_driver(drv);
-}
+extern int of_register_platform_driver(struct of_platform_driver *drv);
+extern void of_unregister_platform_driver(struct of_platform_driver *drv);
  
 extern struct of_device *of_device_alloc(struct device_node *np,
 					 const char *bus_id,
...	...	@@ -26,17 +26,6 @@
26	26	#include <linux/topology.h>
27	27	#include <asm/atomic.h>
28	28
29		-struct bus_type of_platform_bus_type = {
30		- .uevent = of_device_uevent,
31		-};
32		-EXPORT_SYMBOL(of_platform_bus_type);
33		-
34		-static int __init of_bus_driver_init(void)
35		-{
36		- return of_bus_type_init(&of_platform_bus_type, "of_platform");
37		-}
38		-postcore_initcall(of_bus_driver_init);
39		-
40	29	/*
41	30	* The list of OF IDs below is used for matching bus types in the
42	31	* system whose devices are to be exposed as of_platform_devices.
...	...	@@ -213,15 +213,9 @@
213	213	.priority = INT_MAX,
214	214	};
215	215
216		-static struct notifier_block dflt_of_bus_notifier = {
217		- .notifier_call = dflt_bus_notify,
218		- .priority = INT_MAX,
219		-};
220		-
221	216	static int __init setup_bus_notifier(void)
222	217	{
223	218	bus_register_notifier(&platform_bus_type, &dflt_plat_bus_notifier);
224		- bus_register_notifier(&of_platform_bus_type, &dflt_of_bus_notifier);
225	219
226	220	return 0;
227	221	}
...	...	@@ -82,18 +82,10 @@
82	82	.priority = 0,
83	83	};
84	84
85		-static struct notifier_block ppc_swiotlb_of_bus_notifier = {
86		- .notifier_call = ppc_swiotlb_bus_notify,
87		- .priority = 0,
88		-};
89		-
90	85	int __init swiotlb_setup_bus_notifier(void)
91	86	{
92	87	bus_register_notifier(&platform_bus_type,
93	88	&ppc_swiotlb_plat_bus_notifier);
94		- bus_register_notifier(&of_platform_bus_type,
95		- &ppc_swiotlb_of_bus_notifier);
96		-
97	89	return 0;
98	90	}
...	...	@@ -52,18 +52,6 @@
52	52	{},
53	53	};
54	54
55		-struct bus_type of_platform_bus_type = {
56		- .uevent = of_device_uevent,
57		-};
58		-EXPORT_SYMBOL(of_platform_bus_type);
59		-
60		-static int __init of_bus_driver_init(void)
61		-{
62		- return of_bus_type_init(&of_platform_bus_type, "of_platform");
63		-}
64		-
65		-postcore_initcall(of_bus_driver_init);
66		-
67	55	static int of_dev_node_match(struct device dev, void data)
68	56	{
69	57	return to_of_device(dev)->dev.of_node == data;
...	...	@@ -701,16 +701,9 @@
701	701	.priority = INT_MAX,
702	702	};
703	703
704		-static struct notifier_block ppc_dflt_of_bus_notifier = {
705		- .notifier_call = ppc_dflt_bus_notify,
706		- .priority = INT_MAX,
707		-};
708		-
709	704	static int __init setup_bus_notifier(void)
710	705	{
711	706	bus_register_notifier(&platform_bus_type, &ppc_dflt_plat_bus_notifier);
712		- bus_register_notifier(&of_platform_bus_type, &ppc_dflt_of_bus_notifier);
713		-
714	707	return 0;
715	708	}
716	709
...	...	@@ -108,7 +108,7 @@
108	108	celleb_init_direct_mapping();
109	109	set_pci_dma_ops(&dma_direct_ops);
110	110	ppc_md.pci_dma_dev_setup = celleb_pci_dma_dev_setup;
111		- bus_register_notifier(&of_platform_bus_type, &celleb_of_bus_notifier);
	111	+ bus_register_notifier(&platform_bus_type, &celleb_of_bus_notifier);
112	112
113	113	return 0;
114	114	}
...	...	@@ -1204,7 +1204,7 @@
1204	1204	/* Register callbacks on OF platform device addition/removal
1205	1205	* to handle linking them to the right DMA operations
1206	1206	*/
1207		- bus_register_notifier(&of_platform_bus_type, &cell_of_bus_notifier);
	1207	+ bus_register_notifier(&platform_bus_type, &cell_of_bus_notifier);
1208	1208
1209	1209	return 0;
1210	1210	}
...	...	@@ -20,12 +20,7 @@
20	20
21	21	#include <asm/prom.h>
22	22
23		-/*
24		- * These functions provide the necessary setup for the mv64x60 drivers.
25		- * These drivers are unusual in that they work on both the MIPS and PowerPC
26		- * architectures. Because of that, the drivers do not support the normal
27		- * PowerPC of_platform_bus_type. They support platform_bus_type instead.
28		- */
	23	+/* These functions provide the necessary setup for the mv64x60 drivers. */
29	24
30	25	static struct of_device_id __initdata of_mv64x60_devices[] = {
31	26	{ .compatible = "marvell,mv64306-devctrl", },
...	...	@@ -424,7 +424,7 @@
424	424	build_device_resources(op, parent);
425	425
426	426	op->dev.parent = parent;
427		- op->dev.bus = &of_platform_bus_type;
	427	+ op->dev.bus = &platform_bus_type;
428	428	if (!parent)
429	429	dev_set_name(&op->dev, "root");
430	430	else
431	431
432	432
433	433
...	...	@@ -452,30 +452,19 @@
452	452	}
453	453	}
454	454
455		-static void __init scan_of_devices(void)
	455	+static int __init scan_of_devices(void)
456	456	{
457	457	struct device_node *root = of_find_node_by_path("/");
458	458	struct of_device *parent;
459	459
460	460	parent = scan_one_device(root, NULL);
461	461	if (!parent)
462		- return;
	462	+ return 0;
463	463
464	464	scan_tree(root->child, &parent->dev);
	465	+ return 0;
465	466	}
466		-
467		-static int __init of_bus_driver_init(void)
468		-{
469		- int err;
470		-
471		- err = of_bus_type_init(&of_platform_bus_type, "of");
472		- if (!err)
473		- scan_of_devices();
474		-
475		- return err;
476		-}
477		-
478		-postcore_initcall(of_bus_driver_init);
	467	+postcore_initcall(scan_of_devices);
479	468
480	469	static int __init of_debug(char *str)
481	470	{
...	...	@@ -667,7 +667,7 @@
667	667	op->archdata.irqs[i] = build_one_device_irq(op, parent, op->archdata.irqs[i]);
668	668
669	669	op->dev.parent = parent;
670		- op->dev.bus = &of_platform_bus_type;
	670	+ op->dev.bus = &platform_bus_type;
671	671	if (!parent)
672	672	dev_set_name(&op->dev, "root");
673	673	else
674	674
675	675
676	676
...	...	@@ -695,30 +695,19 @@
695	695	}
696	696	}
697	697
698		-static void __init scan_of_devices(void)
	698	+static int __init scan_of_devices(void)
699	699	{
700	700	struct device_node *root = of_find_node_by_path("/");
701	701	struct of_device *parent;
702	702
703	703	parent = scan_one_device(root, NULL);
704	704	if (!parent)
705		- return;
	705	+ return 0;
706	706
707	707	scan_tree(root->child, &parent->dev);
	708	+ return 0;
708	709	}
709		-
710		-static int __init of_bus_driver_init(void)
711		-{
712		- int err;
713		-
714		- err = of_bus_type_init(&of_platform_bus_type, "of");
715		- if (!err)
716		- scan_of_devices();
717		-
718		- return err;
719		-}
720		-
721		-postcore_initcall(of_bus_driver_init);
	710	+postcore_initcall(scan_of_devices);
722	711
723	712	static int __init of_debug(char *str)
724	713	{