[PATCH 2.4.6] Use dev->slot_name in ide-pci.c

• Next message: Peter Denison: "[PATCH 2.4.6] Intel i815 chipset PCI device IDs"
• Previous message: Peter Denison: "[PATCH 2.4.6] Intel chipset IDE driver display improvements"
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Here's a simple patch to cleanup ide-pci.c, so as to use the uniform
pci_dev->slot_name string available as a description, rather than the
previous (inadequately specific) bus->number and devfn fields.

--- drivers/ide/ide-pci.c.old Sun Jul 15 16:43:55 2001
+++ drivers/ide/ide-pci.c Sun Jul 15 17:27:19 2001
@@ -760,7 +760,7 @@

         switch(class_rev) {
                 case 4:
- case 3: printk("%s: IDE controller on PCI bus %02x dev %02x\n", d->name, dev->bus->number, dev->devfn);
+ case 3: printk("%s: IDE controller on PCI slot %s\n", d->name, dev->slot_name);
                         ide_setup_pci_device(dev, d);
                         return;
                 default: break;
@@ -783,12 +783,12 @@
                         break;
                 }
         }
- printk("%s: IDE controller on PCI bus %02x dev %02x\n", d->name, dev->bus->number, dev->devfn);
+ printk("%s: IDE controller on PCI slot %s\n", d->name, dev->slot_name);
         ide_setup_pci_device(dev, d);
         if (!dev2)
                 return;
         d2 = d;
- printk("%s: IDE controller on PCI bus %02x dev %02x\n", d2->name, dev2->bus->number, dev2->devfn);
+ printk("%s: IDE controller on PCI slot %s\n", d2->name, dev2->slot_name);
         ide_setup_pci_device(dev2, d2);
 }

@@ -816,10 +816,10 @@
                 hpt366_device_order_fixup(dev, d);
         else if (!IDE_PCI_DEVID_EQ(d->devid, IDE_PCI_DEVID_NULL) || (dev->class >> 8) == PCI_CLASS_STORAGE_IDE) {
                 if (IDE_PCI_DEVID_EQ(d->devid, IDE_PCI_DEVID_NULL))
- printk("%s: unknown IDE controller on PCI bus %02x device %02x, VID=%04x, DID=%04x\n",
- d->name, dev->bus->number, dev->devfn, devid.vid, devid.did);
+ printk("%s: unknown IDE controller on PCI slot %s, VID=%04x, DID=%04x\n",
+ d->name, dev->slot_name, devid.vid, devid.did);
                 else
- printk("%s: IDE controller on PCI bus %02x dev %02x\n", d->name, dev->bus->number, dev->devfn);
+ printk("%s: IDE controller on PCI slot %s\n", d->name, dev->slot_name);
                 ide_setup_pci_device(dev, d);
         }
 }

-- 
Peter Denison <peterd@pnd-pc.demon.co.uk>
Linux Driver for Promise DC4030VL cards.
See http://www.pnd-pc.demon.co.uk/promise/promise.html for details
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

• Next message: Peter Denison: "[PATCH 2.4.6] Intel i815 chipset PCI device IDs"
• Previous message: Peter Denison: "[PATCH 2.4.6] Intel chipset IDE driver display improvements"
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

This archive was generated by hypermail 2b29 : Mon Jul 23 2001 - 21:00:07 EST