Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

[safe/jmp/linux-2.6] / drivers / mca / mca-bus.c

diff --git a/drivers/mca/mca-bus.c b/drivers/mca/mca-bus.c
index da862e4..ada5ebb 100644 (file)
--- a/drivers/mca/mca-bus.c
+++ b/drivers/mca/mca-bus.c
@@ -40,26 +40,32 @@ static struct mca_bus *mca_root_busses[MAX_MCA_BUSSES];
 
 struct mca_device_info {
        short pos_id;           /* the 2 byte pos id for this card */
-       char name[DEVICE_NAME_SIZE];
+       char name[50];
 };
 
 static int mca_bus_match (struct device *dev, struct device_driver *drv)
 {
        struct mca_device *mca_dev = to_mca_device (dev);
        struct mca_driver *mca_drv = to_mca_driver (drv);
-       const short *mca_ids = mca_drv->id_table;
-       int i;
-
-       if (!mca_ids)
-               return 0;
-
-       for(i = 0; mca_ids[i]; i++) {
-               if (mca_ids[i] == mca_dev->pos_id) {
-                       mca_dev->index = i;
-                       return 1;
+       const unsigned short *mca_ids = mca_drv->id_table;
+       int i = 0;
+
+       if (mca_ids) {
+               for(i = 0; mca_ids[i]; i++) {
+                       if (mca_ids[i] == mca_dev->pos_id) {
+                               mca_dev->index = i;
+                               return 1;
+                       }
                }
        }
-
+       /* If the integrated id is present, treat it as though it were an
+        * additional id in the id_table (it can't be because by definition,
+        * integrated id's overflow a short */
+       if (mca_drv->integrated_id && mca_dev->pos_id ==
+           mca_drv->integrated_id) {
+               mca_dev->index = i;
+               return 1;
+       }
        return 0;
 }
 
@@ -104,7 +110,7 @@ int __init mca_register_device(int bus, struct mca_device *mca_dev)
 
        mca_dev->dev.parent = &mca_bus->dev;
        mca_dev->dev.bus = &mca_bus_type;
-       sprintf (mca_dev->dev.bus_id, "%02d:%02X", bus, mca_dev->slot);
+       dev_set_name(&mca_dev->dev, "%02d:%02X", bus, mca_dev->slot);
        mca_dev->dma_mask = mca_bus->default_dma_mask;
        mca_dev->dev.dma_mask = &mca_dev->dma_mask;
        mca_dev->dev.coherent_dma_mask = mca_dev->dma_mask;
@@ -145,7 +151,7 @@ struct mca_bus * __devinit mca_attach_bus(int bus)
        if (!mca_bus)
                return NULL;
 
-       sprintf(mca_bus->dev.bus_id,"mca%d",bus);
+       dev_set_name(&mca_bus->dev, "mca%d", bus);
        sprintf(mca_bus->name,"Host %s MCA Bridge", bus ? "Secondary" : "Primary");
        if (device_register(&mca_bus->dev)) {
                kfree(mca_bus);