USB: stir4200.c: remove err() usage
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 25 Apr 2012 21:48:51 +0000 (14:48 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 25 Apr 2012 21:48:51 +0000 (14:48 -0700)
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>
drivers/net/irda/stir4200.c

index e6e59a078ef43a5443c8d0ed3f8268bdfdadd681..876e709b65baac208c722c263fb7f300d85d9181 100644 (file)
@@ -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;
        }