diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/ax88796.c | 2 | ||||
-rw-r--r-- | drivers/net/bnx2.c | 2 | ||||
-rw-r--r-- | drivers/net/ehea/ehea_main.c | 8 | ||||
-rw-r--r-- | drivers/net/myri10ge/myri10ge.c | 3 | ||||
-rw-r--r-- | drivers/net/sky2.c | 2 | ||||
-rw-r--r-- | drivers/net/usb/mcs7830.c | 16 | ||||
-rw-r--r-- | drivers/net/xen-netfront.c | 2 |
7 files changed, 18 insertions, 17 deletions
diff --git a/drivers/net/ax88796.c b/drivers/net/ax88796.c index 9fe0517cf893..7495a9ee8f4b 100644 --- a/drivers/net/ax88796.c +++ b/drivers/net/ax88796.c | |||
@@ -900,7 +900,7 @@ static int ax_probe(struct platform_device *pdev) | |||
900 | 900 | ||
901 | ax->map2 = ioremap(res->start, size); | 901 | ax->map2 = ioremap(res->start, size); |
902 | if (ax->map2 == NULL) { | 902 | if (ax->map2 == NULL) { |
903 | dev_err(&pdev->dev, "cannot map reset register"); | 903 | dev_err(&pdev->dev, "cannot map reset register\n"); |
904 | ret = -ENXIO; | 904 | ret = -ENXIO; |
905 | goto exit_mem2; | 905 | goto exit_mem2; |
906 | } | 906 | } |
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index 78ed633ceb82..fa0d69ab908e 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c | |||
@@ -6428,7 +6428,7 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev) | |||
6428 | /* enable device (incl. PCI PM wakeup), and bus-mastering */ | 6428 | /* enable device (incl. PCI PM wakeup), and bus-mastering */ |
6429 | rc = pci_enable_device(pdev); | 6429 | rc = pci_enable_device(pdev); |
6430 | if (rc) { | 6430 | if (rc) { |
6431 | dev_err(&pdev->dev, "Cannot enable PCI device, aborting."); | 6431 | dev_err(&pdev->dev, "Cannot enable PCI device, aborting.\n"); |
6432 | goto err_out; | 6432 | goto err_out; |
6433 | } | 6433 | } |
6434 | 6434 | ||
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c index fe5ffac7ac57..2809c99906e0 100644 --- a/drivers/net/ehea/ehea_main.c +++ b/drivers/net/ehea/ehea_main.c | |||
@@ -3218,7 +3218,7 @@ static int __devinit ehea_probe_adapter(struct of_device *dev, | |||
3218 | /* get adapter properties */ | 3218 | /* get adapter properties */ |
3219 | ret = ehea_sense_adapter_attr(adapter); | 3219 | ret = ehea_sense_adapter_attr(adapter); |
3220 | if (ret) { | 3220 | if (ret) { |
3221 | dev_err(&dev->dev, "sense_adapter_attr failed: %d", ret); | 3221 | dev_err(&dev->dev, "sense_adapter_attr failed: %d\n", ret); |
3222 | goto out_free_ad; | 3222 | goto out_free_ad; |
3223 | } | 3223 | } |
3224 | 3224 | ||
@@ -3226,7 +3226,7 @@ static int __devinit ehea_probe_adapter(struct of_device *dev, | |||
3226 | EHEA_NEQ, EHEA_MAX_ENTRIES_EQ, 1); | 3226 | EHEA_NEQ, EHEA_MAX_ENTRIES_EQ, 1); |
3227 | if (!adapter->neq) { | 3227 | if (!adapter->neq) { |
3228 | ret = -EIO; | 3228 | ret = -EIO; |
3229 | dev_err(&dev->dev, "NEQ creation failed"); | 3229 | dev_err(&dev->dev, "NEQ creation failed\n"); |
3230 | goto out_free_ad; | 3230 | goto out_free_ad; |
3231 | } | 3231 | } |
3232 | 3232 | ||
@@ -3237,7 +3237,7 @@ static int __devinit ehea_probe_adapter(struct of_device *dev, | |||
3237 | ehea_interrupt_neq, IRQF_DISABLED, | 3237 | ehea_interrupt_neq, IRQF_DISABLED, |
3238 | "ehea_neq", adapter); | 3238 | "ehea_neq", adapter); |
3239 | if (ret) { | 3239 | if (ret) { |
3240 | dev_err(&dev->dev, "requesting NEQ IRQ failed"); | 3240 | dev_err(&dev->dev, "requesting NEQ IRQ failed\n"); |
3241 | goto out_kill_eq; | 3241 | goto out_kill_eq; |
3242 | } | 3242 | } |
3243 | 3243 | ||
@@ -3247,7 +3247,7 @@ static int __devinit ehea_probe_adapter(struct of_device *dev, | |||
3247 | 3247 | ||
3248 | ret = ehea_setup_ports(adapter); | 3248 | ret = ehea_setup_ports(adapter); |
3249 | if (ret) { | 3249 | if (ret) { |
3250 | dev_err(&dev->dev, "setup_ports failed"); | 3250 | dev_err(&dev->dev, "setup_ports failed\n"); |
3251 | goto out_rem_dev_sysfs; | 3251 | goto out_rem_dev_sysfs; |
3252 | } | 3252 | } |
3253 | 3253 | ||
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c index 64c8151f2004..366e62a2b1e5 100644 --- a/drivers/net/myri10ge/myri10ge.c +++ b/drivers/net/myri10ge/myri10ge.c | |||
@@ -3058,7 +3058,8 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
3058 | if (status != 0) { | 3058 | if (status != 0) { |
3059 | dac_enabled = 0; | 3059 | dac_enabled = 0; |
3060 | dev_err(&pdev->dev, | 3060 | dev_err(&pdev->dev, |
3061 | "64-bit pci address mask was refused, trying 32-bit"); | 3061 | "64-bit pci address mask was refused, " |
3062 | "trying 32-bit\n"); | ||
3062 | status = pci_set_dma_mask(pdev, DMA_32BIT_MASK); | 3063 | status = pci_set_dma_mask(pdev, DMA_32BIT_MASK); |
3063 | } | 3064 | } |
3064 | if (status != 0) { | 3065 | if (status != 0) { |
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 7967240534d5..70d7e478a3e0 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c | |||
@@ -3961,7 +3961,7 @@ static __devinit struct net_device *sky2_init_netdev(struct sky2_hw *hw, | |||
3961 | struct net_device *dev = alloc_etherdev(sizeof(*sky2)); | 3961 | struct net_device *dev = alloc_etherdev(sizeof(*sky2)); |
3962 | 3962 | ||
3963 | if (!dev) { | 3963 | if (!dev) { |
3964 | dev_err(&hw->pdev->dev, "etherdev alloc failed"); | 3964 | dev_err(&hw->pdev->dev, "etherdev alloc failed\n"); |
3965 | return NULL; | 3965 | return NULL; |
3966 | } | 3966 | } |
3967 | 3967 | ||
diff --git a/drivers/net/usb/mcs7830.c b/drivers/net/usb/mcs7830.c index 6240b978fe3d..f55a5951733a 100644 --- a/drivers/net/usb/mcs7830.c +++ b/drivers/net/usb/mcs7830.c | |||
@@ -114,8 +114,8 @@ static void mcs7830_async_cmd_callback(struct urb *urb) | |||
114 | struct usb_ctrlrequest *req = (struct usb_ctrlrequest *)urb->context; | 114 | struct usb_ctrlrequest *req = (struct usb_ctrlrequest *)urb->context; |
115 | 115 | ||
116 | if (urb->status < 0) | 116 | if (urb->status < 0) |
117 | printk(KERN_DEBUG "mcs7830_async_cmd_callback() failed with %d", | 117 | printk(KERN_DEBUG "%s() failed with %d\n", |
118 | urb->status); | 118 | __FUNCTION__, urb->status); |
119 | 119 | ||
120 | kfree(req); | 120 | kfree(req); |
121 | usb_free_urb(urb); | 121 | usb_free_urb(urb); |
@@ -129,15 +129,15 @@ static void mcs7830_set_reg_async(struct usbnet *dev, u16 index, u16 size, void | |||
129 | 129 | ||
130 | urb = usb_alloc_urb(0, GFP_ATOMIC); | 130 | urb = usb_alloc_urb(0, GFP_ATOMIC); |
131 | if (!urb) { | 131 | if (!urb) { |
132 | dev_dbg(&dev->udev->dev, "Error allocating URB " | 132 | dev_dbg(&dev->udev->dev, |
133 | "in write_cmd_async!"); | 133 | "Error allocating URB in write_cmd_async!\n"); |
134 | return; | 134 | return; |
135 | } | 135 | } |
136 | 136 | ||
137 | req = kmalloc(sizeof *req, GFP_ATOMIC); | 137 | req = kmalloc(sizeof *req, GFP_ATOMIC); |
138 | if (!req) { | 138 | if (!req) { |
139 | dev_err(&dev->udev->dev, "Failed to allocate memory for " | 139 | dev_err(&dev->udev->dev, |
140 | "control request"); | 140 | "Failed to allocate memory for control request\n"); |
141 | goto out; | 141 | goto out; |
142 | } | 142 | } |
143 | req->bRequestType = MCS7830_WR_BMREQ; | 143 | req->bRequestType = MCS7830_WR_BMREQ; |
@@ -153,8 +153,8 @@ static void mcs7830_set_reg_async(struct usbnet *dev, u16 index, u16 size, void | |||
153 | 153 | ||
154 | ret = usb_submit_urb(urb, GFP_ATOMIC); | 154 | ret = usb_submit_urb(urb, GFP_ATOMIC); |
155 | if (ret < 0) { | 155 | if (ret < 0) { |
156 | dev_err(&dev->udev->dev, "Error submitting the control " | 156 | dev_err(&dev->udev->dev, |
157 | "message: ret=%d", ret); | 157 | "Error submitting the control message: ret=%d\n", ret); |
158 | goto out; | 158 | goto out; |
159 | } | 159 | } |
160 | return; | 160 | return; |
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c index 7fd505cc4f7a..2a8fc431099f 100644 --- a/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c | |||
@@ -1526,7 +1526,7 @@ static int xennet_connect(struct net_device *dev) | |||
1526 | 1526 | ||
1527 | if (!feature_rx_copy) { | 1527 | if (!feature_rx_copy) { |
1528 | dev_info(&dev->dev, | 1528 | dev_info(&dev->dev, |
1529 | "backend does not support copying recieve path"); | 1529 | "backend does not support copying receive path\n"); |
1530 | return -ENODEV; | 1530 | return -ENODEV; |
1531 | } | 1531 | } |
1532 | 1532 | ||