diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-25 17:48:51 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-25 17:48:51 -0400 |
commit | 46267f4caa5fdf546a94b99b4c53c9424d2d4291 (patch) | |
tree | e8422e30c6b163a4f44f9f8a5d3c085ac8069112 /drivers/net/irda/stir4200.c | |
parent | d867c43e248fa9369eb40c443eeb5e8bdd717b04 (diff) |
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/stir4200.c')
-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 e6e59a078ef4..876e709b65ba 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) | |||
904 | sprintf(hwname, "usb#%d", stir->usbdev->devnum); | 904 | sprintf(hwname, "usb#%d", stir->usbdev->devnum); |
905 | stir->irlap = irlap_open(netdev, &stir->qos, hwname); | 905 | stir->irlap = irlap_open(netdev, &stir->qos, hwname); |
906 | if (!stir->irlap) { | 906 | if (!stir->irlap) { |
907 | err("stir4200: irlap_open failed"); | 907 | dev_err(&stir->usbdev->dev, "irlap_open failed\n"); |
908 | goto err_out5; | 908 | goto err_out5; |
909 | } | 909 | } |
910 | 910 | ||
@@ -913,7 +913,7 @@ static int stir_net_open(struct net_device *netdev) | |||
913 | "%s", stir->netdev->name); | 913 | "%s", stir->netdev->name); |
914 | if (IS_ERR(stir->thread)) { | 914 | if (IS_ERR(stir->thread)) { |
915 | err = PTR_ERR(stir->thread); | 915 | err = PTR_ERR(stir->thread); |
916 | err("stir4200: unable to start kernel thread"); | 916 | dev_err(&stir->usbdev->dev, "unable to start kernel thread\n"); |
917 | goto err_out6; | 917 | goto err_out6; |
918 | } | 918 | } |
919 | 919 | ||
@@ -1042,7 +1042,7 @@ static int stir_probe(struct usb_interface *intf, | |||
1042 | 1042 | ||
1043 | ret = usb_reset_configuration(dev); | 1043 | ret = usb_reset_configuration(dev); |
1044 | if (ret != 0) { | 1044 | if (ret != 0) { |
1045 | err("stir4200: usb reset configuration failed"); | 1045 | dev_err(&intf->dev, "usb reset configuration failed\n"); |
1046 | goto err_out2; | 1046 | goto err_out2; |
1047 | } | 1047 | } |
1048 | 1048 | ||