Merge branch 'next' into for-linus

[~andy/linux] / drivers / input / mouse / bcm5974.c

diff --git a/drivers/input/mouse/bcm5974.c b/drivers/input/mouse/bcm5974.c
index e410b98c2271dcd4d406a042000f8374eb3ee9af..d528c23e194f6efcbe7efbe8651d218aa6ef7965 100644 (file)
--- a/drivers/input/mouse/bcm5974.c
+++ b/drivers/input/mouse/bcm5974.c
@@ -604,7 +604,7 @@ static int bcm5974_wellspring_mode(struct bcm5974 *dev, bool on)
        int retval = 0, size;
 
        if (!data) {
-               err("bcm5974: out of memory");
+               dev_err(&dev->intf->dev, "out of memory\n");
                retval = -ENOMEM;
                goto out;
        }
@@ -617,7 +617,7 @@ static int bcm5974_wellspring_mode(struct bcm5974 *dev, bool on)
                        BCM5974_WELLSPRING_MODE_REQUEST_INDEX, data, 8, 5000);
 
        if (size != 8) {
-               err("bcm5974: could not read from device");
+               dev_err(&dev->intf->dev, "could not read from device\n");
                retval = -EIO;
                goto out;
        }
@@ -635,7 +635,7 @@ static int bcm5974_wellspring_mode(struct bcm5974 *dev, bool on)
                        BCM5974_WELLSPRING_MODE_REQUEST_INDEX, data, 8, 5000);
 
        if (size != 8) {
-               err("bcm5974: could not write to device");
+               dev_err(&dev->intf->dev, "could not write to device\n");
                retval = -EIO;
                goto out;
        }
@@ -651,6 +651,7 @@ static int bcm5974_wellspring_mode(struct bcm5974 *dev, bool on)
 static void bcm5974_irq_button(struct urb *urb)
 {
        struct bcm5974 *dev = urb->context;
+       struct usb_interface *intf = dev->intf;
        int error;
 
        switch (urb->status) {
@@ -660,10 +661,11 @@ static void bcm5974_irq_button(struct urb *urb)
        case -ECONNRESET:
        case -ENOENT:
        case -ESHUTDOWN:
-               dbg("bcm5974: button urb shutting down: %d", urb->status);
+               dev_dbg(&intf->dev, "button urb shutting down: %d\n",
+                       urb->status);
                return;
        default:
-               dbg("bcm5974: button urb status: %d", urb->status);
+               dev_dbg(&intf->dev, "button urb status: %d\n", urb->status);
                goto exit;
        }
 
@@ -674,12 +676,13 @@ static void bcm5974_irq_button(struct urb *urb)
 exit:
        error = usb_submit_urb(dev->bt_urb, GFP_ATOMIC);
        if (error)
-               err("bcm5974: button urb failed: %d", error);
+               dev_err(&intf->dev, "button urb failed: %d\n", error);
 }
 
 static void bcm5974_irq_trackpad(struct urb *urb)
 {
        struct bcm5974 *dev = urb->context;
+       struct usb_interface *intf = dev->intf;
        int error;
 
        switch (urb->status) {
@@ -689,10 +692,11 @@ static void bcm5974_irq_trackpad(struct urb *urb)
        case -ECONNRESET:
        case -ENOENT:
        case -ESHUTDOWN:
-               dbg("bcm5974: trackpad urb shutting down: %d", urb->status);
+               dev_dbg(&intf->dev, "trackpad urb shutting down: %d\n",
+                       urb->status);
                return;
        default:
-               dbg("bcm5974: trackpad urb status: %d", urb->status);
+               dev_dbg(&intf->dev, "trackpad urb status: %d\n", urb->status);
                goto exit;
        }
 
@@ -707,7 +711,7 @@ static void bcm5974_irq_trackpad(struct urb *urb)
 exit:
        error = usb_submit_urb(dev->tp_urb, GFP_ATOMIC);
        if (error)
-               err("bcm5974: trackpad urb failed: %d", error);
+               dev_err(&intf->dev, "trackpad urb failed: %d\n", error);
 }
 
 /*
@@ -853,7 +857,7 @@ static int bcm5974_probe(struct usb_interface *iface,
        dev = kzalloc(sizeof(struct bcm5974), GFP_KERNEL);
        input_dev = input_allocate_device();
        if (!dev || !input_dev) {
-               err("bcm5974: out of memory");
+               dev_err(&iface->dev, "out of memory\n");
                goto err_free_devs;
        }