diff options
Diffstat (limited to 'drivers/net/via-velocity.c')
-rw-r--r-- | drivers/net/via-velocity.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c index 7e3b2a318146..f5b0078eb4ad 100644 --- a/drivers/net/via-velocity.c +++ b/drivers/net/via-velocity.c | |||
@@ -695,14 +695,14 @@ static int __devinit velocity_found1(struct pci_dev *pdev, const struct pci_devi | |||
695 | * can support more than MAX_UNITS. | 695 | * can support more than MAX_UNITS. |
696 | */ | 696 | */ |
697 | if (velocity_nics >= MAX_UNITS) { | 697 | if (velocity_nics >= MAX_UNITS) { |
698 | dev_printk(KERN_NOTICE, &pdev->dev, "already found %d NICs.\n", | 698 | dev_notice(&pdev->dev, "already found %d NICs.\n", |
699 | velocity_nics); | 699 | velocity_nics); |
700 | return -ENODEV; | 700 | return -ENODEV; |
701 | } | 701 | } |
702 | 702 | ||
703 | dev = alloc_etherdev(sizeof(struct velocity_info)); | 703 | dev = alloc_etherdev(sizeof(struct velocity_info)); |
704 | if (!dev) { | 704 | if (!dev) { |
705 | dev_printk(KERN_ERR, &pdev->dev, "allocate net device failed.\n"); | 705 | dev_err(&pdev->dev, "allocate net device failed.\n"); |
706 | goto out; | 706 | goto out; |
707 | } | 707 | } |
708 | 708 | ||
@@ -739,7 +739,7 @@ static int __devinit velocity_found1(struct pci_dev *pdev, const struct pci_devi | |||
739 | 739 | ||
740 | ret = pci_request_regions(pdev, VELOCITY_NAME); | 740 | ret = pci_request_regions(pdev, VELOCITY_NAME); |
741 | if (ret < 0) { | 741 | if (ret < 0) { |
742 | dev_printk(KERN_ERR, &pdev->dev, "No PCI resources.\n"); | 742 | dev_err(&pdev->dev, "No PCI resources.\n"); |
743 | goto err_disable; | 743 | goto err_disable; |
744 | } | 744 | } |
745 | 745 | ||
@@ -895,19 +895,19 @@ static int __devinit velocity_get_pci_info(struct velocity_info *vptr, struct pc | |||
895 | vptr->memaddr = pci_resource_start(pdev, 1); | 895 | vptr->memaddr = pci_resource_start(pdev, 1); |
896 | 896 | ||
897 | if (!(pci_resource_flags(pdev, 0) & IORESOURCE_IO)) { | 897 | if (!(pci_resource_flags(pdev, 0) & IORESOURCE_IO)) { |
898 | dev_printk(KERN_ERR, &pdev->dev, | 898 | dev_err(&pdev->dev, |
899 | "region #0 is not an I/O resource, aborting.\n"); | 899 | "region #0 is not an I/O resource, aborting.\n"); |
900 | return -EINVAL; | 900 | return -EINVAL; |
901 | } | 901 | } |
902 | 902 | ||
903 | if ((pci_resource_flags(pdev, 1) & IORESOURCE_IO)) { | 903 | if ((pci_resource_flags(pdev, 1) & IORESOURCE_IO)) { |
904 | dev_printk(KERN_ERR, &pdev->dev, | 904 | dev_err(&pdev->dev, |
905 | "region #1 is an I/O resource, aborting.\n"); | 905 | "region #1 is an I/O resource, aborting.\n"); |
906 | return -EINVAL; | 906 | return -EINVAL; |
907 | } | 907 | } |
908 | 908 | ||
909 | if (pci_resource_len(pdev, 1) < VELOCITY_IO_SIZE) { | 909 | if (pci_resource_len(pdev, 1) < VELOCITY_IO_SIZE) { |
910 | dev_printk(KERN_ERR, &pdev->dev, "region #1 is too small.\n"); | 910 | dev_err(&pdev->dev, "region #1 is too small.\n"); |
911 | return -EINVAL; | 911 | return -EINVAL; |
912 | } | 912 | } |
913 | vptr->pdev = pdev; | 913 | vptr->pdev = pdev; |