diff options
Diffstat (limited to 'drivers/net/pci-skeleton.c')
-rw-r--r-- | drivers/net/pci-skeleton.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/net/pci-skeleton.c b/drivers/net/pci-skeleton.c index 9c1ce318b077..e0e293964042 100644 --- a/drivers/net/pci-skeleton.c +++ b/drivers/net/pci-skeleton.c | |||
@@ -601,8 +601,7 @@ static int __devinit netdrv_init_board (struct pci_dev *pdev, | |||
601 | /* dev zeroed in alloc_etherdev */ | 601 | /* dev zeroed in alloc_etherdev */ |
602 | dev = alloc_etherdev (sizeof (*tp)); | 602 | dev = alloc_etherdev (sizeof (*tp)); |
603 | if (dev == NULL) { | 603 | if (dev == NULL) { |
604 | dev_printk (KERN_ERR, &pdev->dev, | 604 | dev_err(&pdev->dev, "unable to alloc new ethernet\n"); |
605 | "unable to alloc new ethernet\n"); | ||
606 | DPRINTK ("EXIT, returning -ENOMEM\n"); | 605 | DPRINTK ("EXIT, returning -ENOMEM\n"); |
607 | return -ENOMEM; | 606 | return -ENOMEM; |
608 | } | 607 | } |
@@ -632,16 +631,14 @@ static int __devinit netdrv_init_board (struct pci_dev *pdev, | |||
632 | 631 | ||
633 | /* make sure PCI base addr 0 is PIO */ | 632 | /* make sure PCI base addr 0 is PIO */ |
634 | if (!(pio_flags & IORESOURCE_IO)) { | 633 | if (!(pio_flags & IORESOURCE_IO)) { |
635 | dev_printk (KERN_ERR, &pdev->dev, | 634 | dev_err(&pdev->dev, "region #0 not a PIO resource, aborting\n"); |
636 | "region #0 not a PIO resource, aborting\n"); | ||
637 | rc = -ENODEV; | 635 | rc = -ENODEV; |
638 | goto err_out; | 636 | goto err_out; |
639 | } | 637 | } |
640 | 638 | ||
641 | /* make sure PCI base addr 1 is MMIO */ | 639 | /* make sure PCI base addr 1 is MMIO */ |
642 | if (!(mmio_flags & IORESOURCE_MEM)) { | 640 | if (!(mmio_flags & IORESOURCE_MEM)) { |
643 | dev_printk (KERN_ERR, &pdev->dev, | 641 | dev_err(&pdev->dev, "region #1 not an MMIO resource, aborting\n"); |
644 | "region #1 not an MMIO resource, aborting\n"); | ||
645 | rc = -ENODEV; | 642 | rc = -ENODEV; |
646 | goto err_out; | 643 | goto err_out; |
647 | } | 644 | } |
@@ -649,8 +646,7 @@ static int __devinit netdrv_init_board (struct pci_dev *pdev, | |||
649 | /* check for weird/broken PCI region reporting */ | 646 | /* check for weird/broken PCI region reporting */ |
650 | if ((pio_len < NETDRV_MIN_IO_SIZE) || | 647 | if ((pio_len < NETDRV_MIN_IO_SIZE) || |
651 | (mmio_len < NETDRV_MIN_IO_SIZE)) { | 648 | (mmio_len < NETDRV_MIN_IO_SIZE)) { |
652 | dev_printk (KERN_ERR, &pdev->dev, | 649 | dev_err(&pdev->dev, "Invalid PCI region size(s), aborting\n"); |
653 | "Invalid PCI region size(s), aborting\n"); | ||
654 | rc = -ENODEV; | 650 | rc = -ENODEV; |
655 | goto err_out; | 651 | goto err_out; |
656 | } | 652 | } |
@@ -667,8 +663,7 @@ static int __devinit netdrv_init_board (struct pci_dev *pdev, | |||
667 | /* ioremap MMIO region */ | 663 | /* ioremap MMIO region */ |
668 | ioaddr = ioremap (mmio_start, mmio_len); | 664 | ioaddr = ioremap (mmio_start, mmio_len); |
669 | if (ioaddr == NULL) { | 665 | if (ioaddr == NULL) { |
670 | dev_printk (KERN_ERR, &pdev->dev, | 666 | dev_err(&pdev->dev, "cannot remap MMIO, aborting\n"); |
671 | "cannot remap MMIO, aborting\n"); | ||
672 | rc = -EIO; | 667 | rc = -EIO; |
673 | goto err_out_free_res; | 668 | goto err_out_free_res; |
674 | } | 669 | } |