USB: ks959-sir.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>

1 files changed, 19 insertions, 12 deletions

diff --git a/drivers/net/irda/ks959-sir.c b/drivers/net/irda/ks959-sir.c
index abe689dffc72..824e2a93fe8a 100644
--- a/drivers/net/irda/ks959-sir.c
+++ b/drivers/net/irda/ks959-sir.c
@@ -247,8 +247,9 @@ static void ks959_speed_irq(struct urb *urb)
 {
         /* unlink, shutdown, unplug, other nasties */
         if (urb->status != 0) {
-                err("ks959_speed_irq: urb asynchronously failed - %d",
-                    urb->status);
+                dev_err(&urb->dev->dev,
+                        "ks959_speed_irq: urb asynchronously failed - %d\n",
+                        urb->status);
         }
 }
 
@@ -332,14 +333,16 @@ static void ks959_send_irq(struct urb *urb)
 
         /* in process of stopping, just drop data */
         if (!netif_running(kingsun->netdev)) {
-                err("ks959_send_irq: Network not running!");
+                dev_err(&kingsun->usbdev->dev,
+                        "ks959_send_irq: Network not running!\n");
                 return;
         }
 
         /* unlink, shutdown, unplug, other nasties */
         if (urb->status != 0) {
-                err("ks959_send_irq: urb asynchronously failed - %d",
-                    urb->status);
+                dev_err(&kingsun->usbdev->dev,
+                        "ks959_send_irq: urb asynchronously failed - %d\n",
+                        urb->status);
                 return;
         }
 
@@ -358,8 +361,9 @@ static void ks959_send_irq(struct urb *urb)
                 if (kingsun->tx_buf_clear_used > 0) {
                         /* There is more data to be sent */
                         if ((ret = ks959_submit_tx_fragment(kingsun)) != 0) {
-                                err("ks959_send_irq: failed tx_urb submit: %d",
-                                    ret);
+                                dev_err(&kingsun->usbdev->dev,
+                                        "ks959_send_irq: failed tx_urb submit: %d\n",
+                                        ret);
                                 switch (ret) {
                                 case -ENODEV:
                                 case -EPIPE:
@@ -407,7 +411,8 @@ static netdev_tx_t ks959_hard_xmit(struct sk_buff *skb,
         kingsun->tx_buf_clear_used = wraplen;
 
         if ((ret = ks959_submit_tx_fragment(kingsun)) != 0) {
-                err("ks959_hard_xmit: failed tx_urb submit: %d", ret);
+                dev_err(&kingsun->usbdev->dev,
+                        "ks959_hard_xmit: failed tx_urb submit: %d\n", ret);
                 switch (ret) {
                 case -ENODEV:
                 case -EPIPE:
@@ -442,8 +447,9 @@ static void ks959_rcv_irq(struct urb *urb)
 
         /* unlink, shutdown, unplug, other nasties */
         if (urb->status != 0) {
-                err("kingsun_rcv_irq: urb asynchronously failed - %d",
-                    urb->status);
+                dev_err(&kingsun->usbdev->dev,
+                        "kingsun_rcv_irq: urb asynchronously failed - %d\n",
+                        urb->status);
                 kingsun->receiving = 0;
                 return;
         }
@@ -536,7 +542,7 @@ static int ks959_net_open(struct net_device *netdev)
         sprintf(hwname, "usb#%d", kingsun->usbdev->devnum);
         kingsun->irlap = irlap_open(netdev, &kingsun->qos, hwname);
         if (!kingsun->irlap) {
-                err("ks959-sir: irlap_open failed");
+                dev_err(&kingsun->usbdev->dev, "irlap_open failed\n");
                 goto free_mem;
         }
 
@@ -549,7 +555,8 @@ static int ks959_net_open(struct net_device *netdev)
         kingsun->rx_urb->status = 0;
         err = usb_submit_urb(kingsun->rx_urb, GFP_KERNEL);
         if (err) {
-                err("ks959-sir: first urb-submit failed: %d", err);
+                dev_err(&kingsun->usbdev->dev,
+                        "first urb-submit failed: %d\n", err);
                 goto close_irlap;
         }