[PATCH] ppc64: make the bus matching function platform specific

This patch allows us to have a different bus if matching function for
each platform.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>

3 files changed, 32 insertions, 11 deletions

diff --git a/arch/ppc64/kernel/iSeries_vio.c b/arch/ppc64/kernel/iSeries_vio.c
index 48f0ebf4405d..2656b1ca834d 100644
--- a/arch/ppc64/kernel/iSeries_vio.c
+++ b/arch/ppc64/kernel/iSeries_vio.c
@@ -115,13 +115,23 @@ void __init probe_bus_iseries(void)
 }
 
 /**
+ * vio_match_device_iseries: - Tell if a iSeries VIO device matches a
+ *      vio_device_id
+ */
+static int vio_match_device_iseries(const struct vio_device_id *id,
+                const struct vio_dev *dev)
+{
+        return strncmp(dev->type, id->type, strlen(id->type)) == 0;
+}
+
+/**
  * vio_bus_init_iseries: - Initialize the iSeries virtual IO bus
  */
 static int __init vio_bus_init_iseries(void)
 {
         int err;
 
-        err = vio_bus_init();
+        err = vio_bus_init(vio_match_device_iseries);
         if (err == 0) {
                 iommu_vio_init();
                 vio_bus_device.iommu_table = &vio_iommu_table;
diff --git a/arch/ppc64/kernel/vio.c b/arch/ppc64/kernel/vio.c
index 4b9e3712e384..8a243cad0f8b 100644
--- a/arch/ppc64/kernel/vio.c
+++ b/arch/ppc64/kernel/vio.c
@@ -44,11 +44,8 @@ struct vio_dev vio_bus_device  = { /* fake "parent" device */
         .dev.bus = &vio_bus_type,
 };
 
-#ifdef CONFIG_PPC_ISERIES
-
-#define device_is_compatible(a, b)      1
-
-#endif
+static int (*is_match)(const struct vio_device_id *id,
+                const struct vio_dev *dev);
 
 /* convert from struct device to struct vio_dev and pass to driver.
  * dev->driver has already been set by generic code because vio_bus_match
@@ -133,8 +130,7 @@ static const struct vio_device_id * vio_match_device(const struct vio_device_id
         DBGENTER();
 
         while (ids->type) {
-                if ((strncmp(dev->type, ids->type, strlen(ids->type)) == 0) &&
-                        device_is_compatible(dev->dev.platform_data, ids->compat))
+                if (is_match(ids, dev))
                         return ids;
                 ids++;
         }
@@ -168,10 +164,13 @@ static void probe_bus_pseries(void)
 /**
  * vio_bus_init: - Initialize the virtual IO bus
  */
-int __init vio_bus_init(void)
+int __init vio_bus_init(int (*match_func)(const struct vio_device_id *id,
+                        const struct vio_dev *dev))
 {
         int err;
 
+        is_match = match_func;
+
         err = bus_register(&vio_bus_type);
         if (err) {
                 printk(KERN_ERR "failed to register VIO bus\n");
@@ -193,13 +192,24 @@ int __init vio_bus_init(void)
 
 #ifdef CONFIG_PPC_PSERIES
 /**
+ * vio_match_device_pseries: - Tell if a pSeries VIO device matches a
+ *      vio_device_id
+ */
+static int vio_match_device_pseries(const struct vio_device_id *id,
+                const struct vio_dev *dev)
+{
+        return (strncmp(dev->type, id->type, strlen(id->type)) == 0) &&
+                        device_is_compatible(dev->dev.platform_data, id->compat);
+}
+
+/**
  * vio_bus_init_pseries: - Initialize the pSeries virtual IO bus
  */
 static int __init vio_bus_init_pseries(void)
 {
         int err;
 
-        err = vio_bus_init();
+        err = vio_bus_init(vio_match_device_pseries);
         if (err == 0)
                 probe_bus_pseries();
         return err;
diff --git a/include/asm-ppc64/vio.h b/include/asm-ppc64/vio.h
index 1e6d4c4b83a0..70644a232210 100644
--- a/include/asm-ppc64/vio.h
+++ b/include/asm-ppc64/vio.h
@@ -105,6 +105,7 @@ static inline struct vio_dev *to_vio_dev(struct device *dev)
         return container_of(dev, struct vio_dev, dev);
 }
 
-extern int vio_bus_init(void);
+extern int vio_bus_init(int (*is_match)(const struct vio_device_id *id,
+                        const struct vio_dev *dev));
 
 #endif /* _ASM_VIO_H */