diff options
Diffstat (limited to 'drivers/ide/pci/via82cxxx.c')
-rw-r--r-- | drivers/ide/pci/via82cxxx.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c index 5f07eeb736ab..23332556e616 100644 --- a/drivers/ide/pci/via82cxxx.c +++ b/drivers/ide/pci/via82cxxx.c | |||
@@ -401,20 +401,19 @@ static int __devinit via_init_one(struct pci_dev *dev, const struct pci_device_i | |||
401 | */ | 401 | */ |
402 | via_config = via_config_find(&isa); | 402 | via_config = via_config_find(&isa); |
403 | if (!via_config->id) { | 403 | if (!via_config->id) { |
404 | printk(KERN_WARNING "VP_IDE: Unknown VIA SouthBridge, disabling DMA.\n"); | 404 | printk(KERN_WARNING "VP_IDE %s: unknown chipset, skipping\n", |
405 | pci_name(dev)); | ||
405 | return -ENODEV; | 406 | return -ENODEV; |
406 | } | 407 | } |
407 | 408 | ||
408 | /* | 409 | /* |
409 | * Print the boot message. | 410 | * Print the boot message. |
410 | */ | 411 | */ |
411 | printk(KERN_INFO "VP_IDE: VIA %s (rev %02x) IDE %sDMA%s " | 412 | printk(KERN_INFO "VP_IDE %s: VIA %s (rev %02x) IDE %sDMA%s\n", |
412 | "controller on pci%s\n", | 413 | pci_name(dev), via_config->name, isa->revision, |
413 | via_config->name, isa->revision, | ||
414 | via_config->udma_mask ? "U" : "MW", | 414 | via_config->udma_mask ? "U" : "MW", |
415 | via_dma[via_config->udma_mask ? | 415 | via_dma[via_config->udma_mask ? |
416 | (fls(via_config->udma_mask) - 1) : 0], | 416 | (fls(via_config->udma_mask) - 1) : 0]); |
417 | pci_name(dev)); | ||
418 | 417 | ||
419 | pci_dev_put(isa); | 418 | pci_dev_put(isa); |
420 | 419 | ||
@@ -454,7 +453,7 @@ static int __devinit via_init_one(struct pci_dev *dev, const struct pci_device_i | |||
454 | 453 | ||
455 | vdev = kzalloc(sizeof(*vdev), GFP_KERNEL); | 454 | vdev = kzalloc(sizeof(*vdev), GFP_KERNEL); |
456 | if (!vdev) { | 455 | if (!vdev) { |
457 | printk(KERN_ERR "VP_IDE: out of memory :(\n"); | 456 | printk(KERN_ERR "VP_IDE %s: out of memory :(\n", pci_name(dev)); |
458 | return -ENOMEM; | 457 | return -ENOMEM; |
459 | } | 458 | } |
460 | 459 | ||