diff options
author | Joe Perches <joe@perches.com> | 2010-02-17 05:30:24 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-02-17 16:35:41 -0500 |
commit | a475f603d23392f386e45cf377b17c30ed3bbb80 (patch) | |
tree | 47e3377f1a1bf402f33dbddc4e14768e2a9881ec /drivers/net/usb/rndis_host.c | |
parent | 60b86755929e1a7e9038c8d860a8491cfdf8d93a (diff) |
drivers/net/usb: Use netif_<level> logging facilities
Convert from:
if (netif_msg_<foo>(priv))
dev_<level>(dev...
to
netif_<level>(priv, foo, dev...
Also convert a few:
if (i < REG_TIMEOUT) {
etc...
return ret;
}
to
if (i >= REG_TIMEOUT)
goto fail;
etc...
return ret;
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb/rndis_host.c')
-rw-r--r-- | drivers/net/usb/rndis_host.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/net/usb/rndis_host.c b/drivers/net/usb/rndis_host.c index f01f02401856..4ce331fb1e1e 100644 --- a/drivers/net/usb/rndis_host.c +++ b/drivers/net/usb/rndis_host.c | |||
@@ -335,8 +335,8 @@ generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags) | |||
335 | 335 | ||
336 | dev->maxpacket = usb_maxpacket(dev->udev, dev->out, 1); | 336 | dev->maxpacket = usb_maxpacket(dev->udev, dev->out, 1); |
337 | if (dev->maxpacket == 0) { | 337 | if (dev->maxpacket == 0) { |
338 | if (netif_msg_probe(dev)) | 338 | netif_dbg(dev, probe, dev->net, |
339 | dev_dbg(&intf->dev, "dev->maxpacket can't be 0\n"); | 339 | "dev->maxpacket can't be 0\n"); |
340 | retval = -EINVAL; | 340 | retval = -EINVAL; |
341 | goto fail_and_release; | 341 | goto fail_and_release; |
342 | } | 342 | } |
@@ -394,17 +394,15 @@ generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags) | |||
394 | } | 394 | } |
395 | if ((flags & FLAG_RNDIS_PHYM_WIRELESS) && | 395 | if ((flags & FLAG_RNDIS_PHYM_WIRELESS) && |
396 | *phym != RNDIS_PHYSICAL_MEDIUM_WIRELESS_LAN) { | 396 | *phym != RNDIS_PHYSICAL_MEDIUM_WIRELESS_LAN) { |
397 | if (netif_msg_probe(dev)) | 397 | netif_dbg(dev, probe, dev->net, |
398 | dev_dbg(&intf->dev, "driver requires wireless " | 398 | "driver requires wireless physical medium, but device is not\n"); |
399 | "physical medium, but device is not.\n"); | ||
400 | retval = -ENODEV; | 399 | retval = -ENODEV; |
401 | goto halt_fail_and_release; | 400 | goto halt_fail_and_release; |
402 | } | 401 | } |
403 | if ((flags & FLAG_RNDIS_PHYM_NOT_WIRELESS) && | 402 | if ((flags & FLAG_RNDIS_PHYM_NOT_WIRELESS) && |
404 | *phym == RNDIS_PHYSICAL_MEDIUM_WIRELESS_LAN) { | 403 | *phym == RNDIS_PHYSICAL_MEDIUM_WIRELESS_LAN) { |
405 | if (netif_msg_probe(dev)) | 404 | netif_dbg(dev, probe, dev->net, |
406 | dev_dbg(&intf->dev, "driver requires non-wireless " | 405 | "driver requires non-wireless physical medium, but device is wireless.\n"); |
407 | "physical medium, but device is wireless.\n"); | ||
408 | retval = -ENODEV; | 406 | retval = -ENODEV; |
409 | goto halt_fail_and_release; | 407 | goto halt_fail_and_release; |
410 | } | 408 | } |