diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-07-24 16:53:31 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-07-24 16:53:31 -0400 |
commit | 28cfd8af52a9ed4e5bd1751ea6bc0b8c870f68ec (patch) | |
tree | 77491546baa6572cfc22ba7a93062cc857f9adbe /drivers/ide/pci/it821x.c | |
parent | 2a8f7450f828eaee49d66f41f99ac2e54f1160a6 (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/it821x.c')
-rw-r--r-- | drivers/ide/pci/it821x.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/ide/pci/it821x.c b/drivers/ide/pci/it821x.c index c5c91f2109d4..4ce5db98f89a 100644 --- a/drivers/ide/pci/it821x.c +++ b/drivers/ide/pci/it821x.c | |||
@@ -569,7 +569,8 @@ static void __devinit init_hwif_it821x(ide_hwif_t *hwif) | |||
569 | idev->timing10 = 1; | 569 | idev->timing10 = 1; |
570 | hwif->host_flags |= IDE_HFLAG_NO_ATAPI_DMA; | 570 | hwif->host_flags |= IDE_HFLAG_NO_ATAPI_DMA; |
571 | if (idev->smart == 0) | 571 | if (idev->smart == 0) |
572 | printk(KERN_WARNING "it821x: Revision 0x10, workarounds activated.\n"); | 572 | printk(KERN_WARNING "it821x %s: revision 0x10, " |
573 | "workarounds activated\n", pci_name(dev)); | ||
573 | } | 574 | } |
574 | 575 | ||
575 | if (idev->smart == 0) { | 576 | if (idev->smart == 0) { |
@@ -609,11 +610,13 @@ static unsigned int __devinit init_chipset_it821x(struct pci_dev *dev, const cha | |||
609 | 610 | ||
610 | /* Force the card into bypass mode if so requested */ | 611 | /* Force the card into bypass mode if so requested */ |
611 | if (it8212_noraid) { | 612 | if (it8212_noraid) { |
612 | printk(KERN_INFO "it8212: forcing bypass mode.\n"); | 613 | printk(KERN_INFO "it821x %s: forcing bypass mode\n", |
614 | pci_name(dev)); | ||
613 | it8212_disable_raid(dev); | 615 | it8212_disable_raid(dev); |
614 | } | 616 | } |
615 | pci_read_config_byte(dev, 0x50, &conf); | 617 | pci_read_config_byte(dev, 0x50, &conf); |
616 | printk(KERN_INFO "it821x: controller in %s mode.\n", mode[conf & 1]); | 618 | printk(KERN_INFO "it821x %s: controller in %s mode\n", |
619 | pci_name(dev), mode[conf & 1]); | ||
617 | return 0; | 620 | return 0; |
618 | } | 621 | } |
619 | 622 | ||
@@ -654,7 +657,7 @@ static int __devinit it821x_init_one(struct pci_dev *dev, const struct pci_devic | |||
654 | 657 | ||
655 | itdevs = kzalloc(2 * sizeof(*itdevs), GFP_KERNEL); | 658 | itdevs = kzalloc(2 * sizeof(*itdevs), GFP_KERNEL); |
656 | if (itdevs == NULL) { | 659 | if (itdevs == NULL) { |
657 | printk(KERN_ERR "it821x: out of memory\n"); | 660 | printk(KERN_ERR "it821x %s: out of memory\n", pci_name(dev)); |
658 | return -ENOMEM; | 661 | return -ENOMEM; |
659 | } | 662 | } |
660 | 663 | ||