diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-25 14:48:51 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-25 14:48:51 -0700 |
| commit | 46267f4caa5fdf546a94b99b4c53c9424d2d4291 (patch) | |
| tree | e8422e30c6b163a4f44f9f8a5d3c085ac8069112 /drivers/net/irda | |
| parent | d867c43e248fa9369eb40c443eeb5e8bdd717b04 (diff) | |
| download | linux-3.10-46267f4caa5fdf546a94b99b4c53c9424d2d4291.tar.gz linux-3.10-46267f4caa5fdf546a94b99b4c53c9424d2d4291.tar.bz2 linux-3.10-46267f4caa5fdf546a94b99b4c53c9424d2d4291.zip | |
USB: stir4200.c: remove err() usage
err() was a very old USB-specific macro that I thought had
gone away. This patch removes it from being used in the
driver and uses dev_err() instead.
CC: Samuel Ortiz <samuel@sortiz.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/irda')
| -rw-r--r-- | drivers/net/irda/stir4200.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/irda/stir4200.c b/drivers/net/irda/stir4200.c index e6e59a078ef..876e709b65b 100644 --- a/drivers/net/irda/stir4200.c +++ b/drivers/net/irda/stir4200.c @@ -904,7 +904,7 @@ static int stir_net_open(struct net_device *netdev) sprintf(hwname, "usb#%d", stir->usbdev->devnum); stir->irlap = irlap_open(netdev, &stir->qos, hwname); if (!stir->irlap) { - err("stir4200: irlap_open failed"); + dev_err(&stir->usbdev->dev, "irlap_open failed\n"); goto err_out5; } @@ -913,7 +913,7 @@ static int stir_net_open(struct net_device *netdev) "%s", stir->netdev->name); if (IS_ERR(stir->thread)) { err = PTR_ERR(stir->thread); - err("stir4200: unable to start kernel thread"); + dev_err(&stir->usbdev->dev, "unable to start kernel thread\n"); goto err_out6; } @@ -1042,7 +1042,7 @@ static int stir_probe(struct usb_interface *intf, ret = usb_reset_configuration(dev); if (ret != 0) { - err("stir4200: usb reset configuration failed"); + dev_err(&intf->dev, "usb reset configuration failed\n"); goto err_out2; } |