aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/pci/siimage.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-07-24 16:53:31 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-07-24 16:53:31 -0400
commit28cfd8af52a9ed4e5bd1751ea6bc0b8c870f68ec (patch)
tree77491546baa6572cfc22ba7a93062cc857f9adbe /drivers/ide/pci/siimage.c
parent2a8f7450f828eaee49d66f41f99ac2e54f1160a6 (diff)
ide: include PCI device name in messages from IDE PCI host drivers
While at it: * Apply small fixes to messages (s/dma/DMA/, remove trailing '.', etc). * Fix printk() call in ide_setup_pci_baseregs() to use KERN_INFO. * Move printk() call from ide_pci_clear_simplex() to the caller. * Cleanup do_ide_setup_pci_device() a bit. * amd74xx.c: remove superfluous PCI device revision information. * hpt366.c: fix two printk() calls in ->init_chipset to use KERN_INFO. * pdc202xx_new.c: fix printk() call in ->init_chipset to use KERN_INFO. * pdc202xx_old.c: fix driver message in pdc202xx_init_one(). * via82cxxx.c: fix driver warning message in via_init_one(). Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/pci/siimage.c')
-rw-r--r--drivers/ide/pci/siimage.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c
index f2e4dac9b719..fc29f1ca503a 100644
--- a/drivers/ide/pci/siimage.c
+++ b/drivers/ide/pci/siimage.c
@@ -539,7 +539,8 @@ static unsigned int __devinit init_chipset_siimage(struct pci_dev *dev,
539 { "== 100", "== 133", "== 2X PCI", "DISABLED!" }; 539 { "== 100", "== 133", "== 2X PCI", "DISABLED!" };
540 540
541 tmp >>= 4; 541 tmp >>= 4;
542 printk(KERN_INFO "%s: BASE CLOCK %s\n", name, clk_str[tmp & 3]); 542 printk(KERN_INFO "%s %s: BASE CLOCK %s\n",
543 name, pci_name(dev), clk_str[tmp & 3]);
543 } 544 }
544 545
545 return 0; 546 return 0;
@@ -779,8 +780,8 @@ static int __devinit siimage_init_one(struct pci_dev *dev,
779 * seem to get terminally confused in the PCI spaces. 780 * seem to get terminally confused in the PCI spaces.
780 */ 781 */
781 if (!request_mem_region(bar5, barsize, d.name)) { 782 if (!request_mem_region(bar5, barsize, d.name)) {
782 printk(KERN_WARNING "siimage: IDE controller MMIO " 783 printk(KERN_WARNING "siimage %s: MMIO ports not "
783 "ports not available.\n"); 784 "available\n", pci_name(dev));
784 } else { 785 } else {
785 ioaddr = ioremap(bar5, barsize); 786 ioaddr = ioremap(bar5, barsize);
786 if (ioaddr == NULL) 787 if (ioaddr == NULL)