diff options
Diffstat (limited to 'drivers/ide/pci/pdc202xx_new.c')
-rw-r--r-- | drivers/ide/pci/pdc202xx_new.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c index 9881a1a8b89c..4c2b669d7de6 100644 --- a/drivers/ide/pci/pdc202xx_new.c +++ b/drivers/ide/pci/pdc202xx_new.c | |||
@@ -358,12 +358,13 @@ static unsigned int __devinit init_chipset_pdcnew(struct pci_dev *dev, const cha | |||
358 | * registers setting. | 358 | * registers setting. |
359 | */ | 359 | */ |
360 | pll_input = detect_pll_input_clock(dma_base); | 360 | pll_input = detect_pll_input_clock(dma_base); |
361 | printk("%s: PLL input clock is %ld kHz\n", name, pll_input / 1000); | 361 | printk(KERN_INFO "%s %s: PLL input clock is %ld kHz\n", |
362 | name, pci_name(dev), pll_input / 1000); | ||
362 | 363 | ||
363 | /* Sanity check */ | 364 | /* Sanity check */ |
364 | if (unlikely(pll_input < 5000000L || pll_input > 70000000L)) { | 365 | if (unlikely(pll_input < 5000000L || pll_input > 70000000L)) { |
365 | printk(KERN_ERR "%s: Bad PLL input clock %ld Hz, giving up!\n", | 366 | printk(KERN_ERR "%s %s: Bad PLL input clock %ld Hz, giving up!" |
366 | name, pll_input); | 367 | "\n", name, pci_name(dev), pll_input); |
367 | goto out; | 368 | goto out; |
368 | } | 369 | } |
369 | 370 | ||
@@ -399,7 +400,8 @@ static unsigned int __devinit init_chipset_pdcnew(struct pci_dev *dev, const cha | |||
399 | r = 0x00; | 400 | r = 0x00; |
400 | } else { | 401 | } else { |
401 | /* Invalid ratio */ | 402 | /* Invalid ratio */ |
402 | printk(KERN_ERR "%s: Bad ratio %ld, giving up!\n", name, ratio); | 403 | printk(KERN_ERR "%s %s: Bad ratio %ld, giving up!\n", |
404 | name, pci_name(dev), ratio); | ||
403 | goto out; | 405 | goto out; |
404 | } | 406 | } |
405 | 407 | ||
@@ -409,7 +411,8 @@ static unsigned int __devinit init_chipset_pdcnew(struct pci_dev *dev, const cha | |||
409 | 411 | ||
410 | if (unlikely(f < 0 || f > 127)) { | 412 | if (unlikely(f < 0 || f > 127)) { |
411 | /* Invalid F */ | 413 | /* Invalid F */ |
412 | printk(KERN_ERR "%s: F[%d] invalid!\n", name, f); | 414 | printk(KERN_ERR "%s %s: F[%d] invalid!\n", |
415 | name, pci_name(dev), f); | ||
413 | goto out; | 416 | goto out; |
414 | } | 417 | } |
415 | 418 | ||
@@ -455,8 +458,8 @@ static struct pci_dev * __devinit pdc20270_get_dev2(struct pci_dev *dev) | |||
455 | 458 | ||
456 | if (dev2->irq != dev->irq) { | 459 | if (dev2->irq != dev->irq) { |
457 | dev2->irq = dev->irq; | 460 | dev2->irq = dev->irq; |
458 | printk(KERN_INFO "PDC20270: PCI config space " | 461 | printk(KERN_INFO "PDC20270 %s: PCI config space " |
459 | "interrupt fixed\n"); | 462 | "interrupt fixed\n", pci_name(dev)); |
460 | } | 463 | } |
461 | 464 | ||
462 | return dev2; | 465 | return dev2; |
@@ -535,8 +538,8 @@ static int __devinit pdc202new_init_one(struct pci_dev *dev, const struct pci_de | |||
535 | bridge->vendor == PCI_VENDOR_ID_INTEL && | 538 | bridge->vendor == PCI_VENDOR_ID_INTEL && |
536 | (bridge->device == PCI_DEVICE_ID_INTEL_I960 || | 539 | (bridge->device == PCI_DEVICE_ID_INTEL_I960 || |
537 | bridge->device == PCI_DEVICE_ID_INTEL_I960RM)) { | 540 | bridge->device == PCI_DEVICE_ID_INTEL_I960RM)) { |
538 | printk(KERN_INFO "PDC20276: attached to I2O RAID controller, " | 541 | printk(KERN_INFO "PDC20276 %s: attached to I2O RAID controller," |
539 | "skipping\n"); | 542 | " skipping\n", pci_name(dev)); |
540 | return -ENODEV; | 543 | return -ENODEV; |
541 | } | 544 | } |
542 | 545 | ||