]> err.no Git - linux-2.6/commitdiff
ide: enhance ide_setup_pci_noise()
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Fri, 19 Oct 2007 22:32:36 +0000 (00:32 +0200)
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Fri, 19 Oct 2007 22:32:36 +0000 (00:32 +0200)
* Print PCI device Vendor ID, Device ID and revision in
  ide_setup_pci_noise().

* Remove no longer needed PCI device revision printing from
  ide_setup_pci_controller().

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
drivers/ide/setup-pci.c

index 727544c205b900a754399537bcfefb5e2a54043f..02d14bf85ab2112b11a589e8fad9c73d428686bb 100644 (file)
@@ -227,8 +227,9 @@ static unsigned long ide_get_or_set_dma_base(const struct ide_port_info *d, ide_
 
 void ide_setup_pci_noise(struct pci_dev *dev, const struct ide_port_info *d)
 {
-       printk(KERN_INFO "%s: IDE controller at PCI slot %s\n",
-                        d->name, pci_name(dev));
+       printk(KERN_INFO "%s: IDE controller (0x%04x:0x%04x rev 0x%02x) at "
+                        " PCI slot %s\n", d->name, dev->vendor, dev->device,
+                        dev->revision, pci_name(dev));
 }
 
 EXPORT_SYMBOL_GPL(ide_setup_pci_noise);
@@ -497,9 +498,6 @@ static int ide_setup_pci_controller(struct pci_dev *dev, const struct ide_port_i
                printk(KERN_INFO "%s: device enabled (Linux)\n", d->name);
        }
 
-       if (noisy)
-               printk(KERN_INFO "%s: chipset revision %d\n",
-                                d->name, dev->revision);
 out:
        return ret;
 }