diff options
Diffstat (limited to 'drivers/ata/sata_via.c')
-rw-r--r-- | drivers/ata/sata_via.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/ata/sata_via.c b/drivers/ata/sata_via.c index 54434db15b12..9b43ccbcc915 100644 --- a/drivers/ata/sata_via.c +++ b/drivers/ata/sata_via.c | |||
@@ -469,7 +469,7 @@ static int vt6420_prepare_host(struct pci_dev *pdev, struct ata_host **r_host) | |||
469 | 469 | ||
470 | rc = pcim_iomap_regions(pdev, 1 << 5, DRV_NAME); | 470 | rc = pcim_iomap_regions(pdev, 1 << 5, DRV_NAME); |
471 | if (rc) { | 471 | if (rc) { |
472 | dev_printk(KERN_ERR, &pdev->dev, "failed to iomap PCI BAR 5\n"); | 472 | dev_err(&pdev->dev, "failed to iomap PCI BAR 5\n"); |
473 | return rc; | 473 | return rc; |
474 | } | 474 | } |
475 | 475 | ||
@@ -488,14 +488,14 @@ static int vt6421_prepare_host(struct pci_dev *pdev, struct ata_host **r_host) | |||
488 | 488 | ||
489 | *r_host = host = ata_host_alloc_pinfo(&pdev->dev, ppi, ARRAY_SIZE(ppi)); | 489 | *r_host = host = ata_host_alloc_pinfo(&pdev->dev, ppi, ARRAY_SIZE(ppi)); |
490 | if (!host) { | 490 | if (!host) { |
491 | dev_printk(KERN_ERR, &pdev->dev, "failed to allocate host\n"); | 491 | dev_err(&pdev->dev, "failed to allocate host\n"); |
492 | return -ENOMEM; | 492 | return -ENOMEM; |
493 | } | 493 | } |
494 | 494 | ||
495 | rc = pcim_iomap_regions(pdev, 0x3f, DRV_NAME); | 495 | rc = pcim_iomap_regions(pdev, 0x3f, DRV_NAME); |
496 | if (rc) { | 496 | if (rc) { |
497 | dev_printk(KERN_ERR, &pdev->dev, "failed to request/iomap " | 497 | dev_err(&pdev->dev, "failed to request/iomap PCI BARs (errno=%d)\n", |
498 | "PCI BARs (errno=%d)\n", rc); | 498 | rc); |
499 | return rc; | 499 | return rc; |
500 | } | 500 | } |
501 | host->iomap = pcim_iomap_table(pdev); | 501 | host->iomap = pcim_iomap_table(pdev); |
@@ -526,7 +526,7 @@ static int vt8251_prepare_host(struct pci_dev *pdev, struct ata_host **r_host) | |||
526 | 526 | ||
527 | rc = pcim_iomap_regions(pdev, 1 << 5, DRV_NAME); | 527 | rc = pcim_iomap_regions(pdev, 1 << 5, DRV_NAME); |
528 | if (rc) { | 528 | if (rc) { |
529 | dev_printk(KERN_ERR, &pdev->dev, "failed to iomap PCI BAR 5\n"); | 529 | dev_err(&pdev->dev, "failed to iomap PCI BAR 5\n"); |
530 | return rc; | 530 | return rc; |
531 | } | 531 | } |
532 | 532 | ||
@@ -542,8 +542,8 @@ static void svia_configure(struct pci_dev *pdev, int board_id) | |||
542 | u8 tmp8; | 542 | u8 tmp8; |
543 | 543 | ||
544 | pci_read_config_byte(pdev, PCI_INTERRUPT_LINE, &tmp8); | 544 | pci_read_config_byte(pdev, PCI_INTERRUPT_LINE, &tmp8); |
545 | dev_printk(KERN_INFO, &pdev->dev, "routed to hard irq line %d\n", | 545 | dev_info(&pdev->dev, "routed to hard irq line %d\n", |
546 | (int) (tmp8 & 0xf0) == 0xf0 ? 0 : tmp8 & 0x0f); | 546 | (int) (tmp8 & 0xf0) == 0xf0 ? 0 : tmp8 & 0x0f); |
547 | 547 | ||
548 | /* make sure SATA channels are enabled */ | 548 | /* make sure SATA channels are enabled */ |
549 | pci_read_config_byte(pdev, SATA_CHAN_ENAB, &tmp8); | 549 | pci_read_config_byte(pdev, SATA_CHAN_ENAB, &tmp8); |
@@ -628,7 +628,7 @@ static int svia_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
628 | for (i = 0; i < ARRAY_SIZE(svia_bar_sizes); i++) | 628 | for (i = 0; i < ARRAY_SIZE(svia_bar_sizes); i++) |
629 | if ((pci_resource_start(pdev, i) == 0) || | 629 | if ((pci_resource_start(pdev, i) == 0) || |
630 | (pci_resource_len(pdev, i) < bar_sizes[i])) { | 630 | (pci_resource_len(pdev, i) < bar_sizes[i])) { |
631 | dev_printk(KERN_ERR, &pdev->dev, | 631 | dev_err(&pdev->dev, |
632 | "invalid PCI BAR %u (sz 0x%llx, val 0x%llx)\n", | 632 | "invalid PCI BAR %u (sz 0x%llx, val 0x%llx)\n", |
633 | i, | 633 | i, |
634 | (unsigned long long)pci_resource_start(pdev, i), | 634 | (unsigned long long)pci_resource_start(pdev, i), |