[PATCH] powerpc: use a common vio_match_device routine

This requires the compatible properties having vaules that are empty
strings instead of just being empty properties.

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

4 files changed, 7 insertions, 30 deletions

diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c
index 9b46eed5e637..19529297a2dc 100644
--- a/arch/powerpc/kernel/vio.c
+++ b/arch/powerpc/kernel/vio.c
@@ -47,7 +47,8 @@ static const struct vio_device_id *vio_match_device(
                 const struct vio_device_id *ids, const struct vio_dev *dev)
 {
         while (ids->type[0] != '\0') {
-                if (vio_bus_ops.match(ids, dev))
+                if ((strncmp(dev->type, ids->type, strlen(ids->type)) == 0) &&
+                    device_is_compatible(dev->dev.platform_data, ids->compat))
                         return ids;
                 ids++;
         }
diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c
index 901acbcc0888..befd36af7e32 100644
--- a/arch/powerpc/platforms/iseries/setup.c
+++ b/arch/powerpc/platforms/iseries/setup.c
@@ -927,7 +927,7 @@ void dt_vdevices(struct iseries_flat_dt *dt)
         snprintf(buf, sizeof(buf), "viocons@%08x", reg);
         dt_start_node(dt, buf);
         dt_prop_str(dt, "device_type", "serial");
-        dt_prop_empty(dt, "compatible");
+        dt_prop_str(dt, "compatible", "");
         dt_prop_u32(dt, "reg", reg);
         dt_end_node(dt);
         reg++;
@@ -949,7 +949,7 @@ void dt_vdevices(struct iseries_flat_dt *dt)
                 snprintf(buf, 32, "vlan@%08x", reg + i);
                 dt_start_node(dt, buf);
                 dt_prop_str(dt, "device_type", "vlan");
-                dt_prop_empty(dt, "compatible");
+                dt_prop_str(dt, "compatible", "");
                 dt_prop_u32(dt, "reg", reg + i);
                 dt_prop_u32(dt, "linux,unit_address", i);
 
@@ -970,7 +970,7 @@ void dt_vdevices(struct iseries_flat_dt *dt)
                 snprintf(buf, 32, "viodasd@%08x", reg + i);
                 dt_start_node(dt, buf);
                 dt_prop_str(dt, "device_type", "viodasd");
-                dt_prop_empty(dt, "compatible");
+                dt_prop_str(dt, "compatible", "");
                 dt_prop_u32(dt, "reg", reg + i);
                 dt_prop_u32(dt, "linux,unit_address", i);
                 dt_end_node(dt);
@@ -980,7 +980,7 @@ void dt_vdevices(struct iseries_flat_dt *dt)
                 snprintf(buf, 32, "viocd@%08x", reg + i);
                 dt_start_node(dt, buf);
                 dt_prop_str(dt, "device_type", "viocd");
-                dt_prop_empty(dt, "compatible");
+                dt_prop_str(dt, "compatible", "");
                 dt_prop_u32(dt, "reg", reg + i);
                 dt_prop_u32(dt, "linux,unit_address", i);
                 dt_end_node(dt);
@@ -990,7 +990,7 @@ void dt_vdevices(struct iseries_flat_dt *dt)
                 snprintf(buf, 32, "viotape@%08x", reg + i);
                 dt_start_node(dt, buf);
                 dt_prop_str(dt, "device_type", "viotape");
-                dt_prop_empty(dt, "compatible");
+                dt_prop_str(dt, "compatible", "");
                 dt_prop_u32(dt, "reg", reg + i);
                 dt_prop_u32(dt, "linux,unit_address", i);
                 dt_end_node(dt);
diff --git a/arch/powerpc/platforms/iseries/vio.c b/arch/powerpc/platforms/iseries/vio.c
index a689da6f2b07..bdd2b7d97d15 100644
--- a/arch/powerpc/platforms/iseries/vio.c
+++ b/arch/powerpc/platforms/iseries/vio.c
@@ -50,18 +50,7 @@ static struct iommu_table *vio_build_iommu_table(struct vio_dev *dev)
         return &vio_iommu_table;
 }
 
-/**
- * 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;
-}
-
 static struct vio_bus_ops vio_bus_ops_iseries = {
-        .match = vio_match_device_iseries,
         .build_iommu_table = vio_build_iommu_table,
 };
 
@@ -75,5 +64,4 @@ static int __init vio_bus_init_iseries(void)
         iSeries_vio_dev = &vio_bus_device.dev;
         return vio_bus_init(&vio_bus_ops_iseries);
 }
-
 __initcall(vio_bus_init_iseries);
diff --git a/arch/powerpc/platforms/pseries/vio.c b/arch/powerpc/platforms/pseries/vio.c
index b3925aefdac6..d2891661d87b 100644
--- a/arch/powerpc/platforms/pseries/vio.c
+++ b/arch/powerpc/platforms/pseries/vio.c
@@ -27,17 +27,6 @@
 extern struct subsystem devices_subsys; /* needed for vio_find_name() */
 
 /**
- * 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_build_iommu_table: - gets the dma information from OF and
  *      builds the TCE tree.
  * @dev: the virtual device.
@@ -76,7 +65,6 @@ static struct iommu_table *vio_build_iommu_table(struct vio_dev *dev)
 }
 
 static struct vio_bus_ops vio_bus_ops_pseries = {
-        .match = vio_match_device_pseries,
         .build_iommu_table = vio_build_iommu_table,
 };