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/amd74xx.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/amd74xx.c')
-rw-r--r-- | drivers/ide/pci/amd74xx.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/ide/pci/amd74xx.c b/drivers/ide/pci/amd74xx.c index a91f2e873ba4..2b118f80fab6 100644 --- a/drivers/ide/pci/amd74xx.c +++ b/drivers/ide/pci/amd74xx.c | |||
@@ -129,9 +129,9 @@ static void __devinit amd7411_cable_detect(struct pci_dev *dev, | |||
129 | amd_80w = ((t & 0x3) ? 1 : 0) | ((t & 0xc) ? 2 : 0); | 129 | amd_80w = ((t & 0x3) ? 1 : 0) | ((t & 0xc) ? 2 : 0); |
130 | for (i = 24; i >= 0; i -= 8) | 130 | for (i = 24; i >= 0; i -= 8) |
131 | if (((u >> i) & 4) && !(amd_80w & (1 << (1 - (i >> 4))))) { | 131 | if (((u >> i) & 4) && !(amd_80w & (1 << (1 - (i >> 4))))) { |
132 | printk(KERN_WARNING "%s: BIOS didn't set cable bits " | 132 | printk(KERN_WARNING "%s %s: BIOS didn't set cable bits " |
133 | "correctly. Enabling workaround.\n", | 133 | "correctly. Enabling workaround.\n", |
134 | name); | 134 | name, pci_name(dev)); |
135 | amd_80w |= (1 << (1 - (i >> 4))); | 135 | amd_80w |= (1 << (1 - (i >> 4))); |
136 | } | 136 | } |
137 | } | 137 | } |
@@ -280,9 +280,8 @@ static int __devinit amd74xx_probe(struct pci_dev *dev, const struct pci_device_ | |||
280 | d.udma_mask = ATA_UDMA5; | 280 | d.udma_mask = ATA_UDMA5; |
281 | } | 281 | } |
282 | 282 | ||
283 | printk(KERN_INFO "%s: %s (rev %02x) UDMA%s controller\n", | 283 | printk(KERN_INFO "%s %s: UDMA%s controller\n", |
284 | d.name, pci_name(dev), dev->revision, | 284 | d.name, pci_name(dev), amd_dma[fls(d.udma_mask) - 1]); |
285 | amd_dma[fls(d.udma_mask) - 1]); | ||
286 | 285 | ||
287 | /* | 286 | /* |
288 | * Determine the system bus clock. | 287 | * Determine the system bus clock. |