[PATCH] powerpc: use the device tree for the iSeries vio bus probe

[~andy/linux] / arch / powerpc / platforms / iseries / vio.c

diff --git a/arch/powerpc/platforms/iseries/vio.c b/arch/powerpc/platforms/iseries/vio.c
index 22045a2829a98e95e3b435e6760ce7ff10d06bfb..a689da6f2b076de10d7cefc7eb270647cf5e79ef 100644 (file)
--- a/arch/powerpc/platforms/iseries/vio.c
+++ b/arch/powerpc/platforms/iseries/vio.c
@@ -43,58 +43,11 @@ static void __init iommu_vio_init(void)
                printk("Virtual Bus VIO TCE table failed.\n");
 }
 
-/**
- * vio_register_device_iseries: - Register a new iSeries vio device.
- * @voidev:    The device to register.
- */
-static struct vio_dev *__init vio_register_device_iseries(char *type,
-               uint32_t unit_num)
+static struct iommu_table *vio_build_iommu_table(struct vio_dev *dev)
 {
-       struct vio_dev *viodev;
-
-       /* allocate a vio_dev for this device */
-       viodev = kmalloc(sizeof(struct vio_dev), GFP_KERNEL);
-       if (!viodev)
-               return NULL;
-       memset(viodev, 0, sizeof(struct vio_dev));
-
-       snprintf(viodev->dev.bus_id, BUS_ID_SIZE, "%s%d", type, unit_num);
-
-       viodev->name = viodev->dev.bus_id;
-       viodev->type = type;
-       viodev->unit_address = unit_num;
-       viodev->iommu_table = &vio_iommu_table;
-       if (vio_register_device(viodev) == NULL) {
-               kfree(viodev);
-               return NULL;
-       }
-       return viodev;
-}
-
-static void __init probe_bus_iseries(void)
-{
-       HvLpIndexMap vlan_map;
-       struct vio_dev *viodev;
-       int i;
-
-       /* there is only one of each of these */
-       vio_register_device_iseries("viocons", 0);
-       vio_register_device_iseries("vscsi", 0);
-
-       vlan_map = HvLpConfig_getVirtualLanIndexMap();
-       for (i = 0; i < HVMAXARCHITECTEDVIRTUALLANS; i++) {
-               if ((vlan_map & (0x8000 >> i)) == 0)
-                       continue;
-               viodev = vio_register_device_iseries("vlan", i);
-               /* veth is special and has it own iommu_table */
-               viodev->iommu_table = &veth_iommu_table;
-       }
-       for (i = 0; i < HVMAXARCHITECTEDVIRTUALDISKS; i++)
-               vio_register_device_iseries("viodasd", i);
-       for (i = 0; i < HVMAXARCHITECTEDVIRTUALCDROMS; i++)
-               vio_register_device_iseries("viocd", i);
-       for (i = 0; i < HVMAXARCHITECTEDVIRTUALTAPES; i++)
-               vio_register_device_iseries("viotape", i);
+       if (strcmp(dev->type, "vlan") == 0)
+               return &veth_iommu_table;
+       return &vio_iommu_table;
 }
 
 /**
@@ -109,6 +62,7 @@ static int vio_match_device_iseries(const struct vio_device_id *id,
 
 static struct vio_bus_ops vio_bus_ops_iseries = {
        .match = vio_match_device_iseries,
+       .build_iommu_table = vio_build_iommu_table,
 };
 
 /**
@@ -116,16 +70,10 @@ static struct vio_bus_ops vio_bus_ops_iseries = {
  */
 static int __init vio_bus_init_iseries(void)
 {
-       int err;
-
-       err = vio_bus_init(&vio_bus_ops_iseries);
-       if (err == 0) {
-               iommu_vio_init();
-               vio_bus_device.iommu_table = &vio_iommu_table;
-               iSeries_vio_dev = &vio_bus_device.dev;
-               probe_bus_iseries();
-       }
-       return err;
+       iommu_vio_init();
+       vio_bus_device.iommu_table = &vio_iommu_table;
+       iSeries_vio_dev = &vio_bus_device.dev;
+       return vio_bus_init(&vio_bus_ops_iseries);
 }
 
 __initcall(vio_bus_init_iseries);