Commit bd028769 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

USB: bcm5974.c: remove dbg() usage

dbg() was a very old USB-specific macro that should no longer
be used. This patch removes it from being used in the driver
and uses dev_dbg() instead.

CC: Henrik Rydberg <rydberg@euromail.se>
CC: Alessandro Rubini <rubini@ipvvis.unipv.it>
CC: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 67946d13
...@@ -631,6 +631,7 @@ static int bcm5974_wellspring_mode(struct bcm5974 *dev, bool on) ...@@ -631,6 +631,7 @@ static int bcm5974_wellspring_mode(struct bcm5974 *dev, bool on)
static void bcm5974_irq_button(struct urb *urb) static void bcm5974_irq_button(struct urb *urb)
{ {
struct bcm5974 *dev = urb->context; struct bcm5974 *dev = urb->context;
struct input_dev *idev = dev->input;
int error; int error;
switch (urb->status) { switch (urb->status) {
...@@ -640,10 +641,11 @@ static void bcm5974_irq_button(struct urb *urb) ...@@ -640,10 +641,11 @@ static void bcm5974_irq_button(struct urb *urb)
case -ECONNRESET: case -ECONNRESET:
case -ENOENT: case -ENOENT:
case -ESHUTDOWN: case -ESHUTDOWN:
dbg("bcm5974: button urb shutting down: %d", urb->status); dev_dbg(&idev->dev, "button urb shutting down: %d\n",
urb->status);
return; return;
default: default:
dbg("bcm5974: button urb status: %d", urb->status); dev_dbg(&idev->dev, "button urb status: %d\n", urb->status);
goto exit; goto exit;
} }
...@@ -654,12 +656,13 @@ static void bcm5974_irq_button(struct urb *urb) ...@@ -654,12 +656,13 @@ static void bcm5974_irq_button(struct urb *urb)
exit: exit:
error = usb_submit_urb(dev->bt_urb, GFP_ATOMIC); error = usb_submit_urb(dev->bt_urb, GFP_ATOMIC);
if (error) if (error)
dev_err(&dev->input->dev, "button urb failed: %d\n", error); dev_err(&idev->dev, "button urb failed: %d\n", error);
} }
static void bcm5974_irq_trackpad(struct urb *urb) static void bcm5974_irq_trackpad(struct urb *urb)
{ {
struct bcm5974 *dev = urb->context; struct bcm5974 *dev = urb->context;
struct input_dev *idev = dev->input;
int error; int error;
switch (urb->status) { switch (urb->status) {
...@@ -669,10 +672,11 @@ static void bcm5974_irq_trackpad(struct urb *urb) ...@@ -669,10 +672,11 @@ static void bcm5974_irq_trackpad(struct urb *urb)
case -ECONNRESET: case -ECONNRESET:
case -ENOENT: case -ENOENT:
case -ESHUTDOWN: case -ESHUTDOWN:
dbg("bcm5974: trackpad urb shutting down: %d", urb->status); dev_dbg(&idev->dev, "trackpad urb shutting down: %d\n",
urb->status);
return; return;
default: default:
dbg("bcm5974: trackpad urb status: %d", urb->status); dev_dbg(&idev->dev, "trackpad urb status: %d\n", urb->status);
goto exit; goto exit;
} }
...@@ -687,7 +691,7 @@ static void bcm5974_irq_trackpad(struct urb *urb) ...@@ -687,7 +691,7 @@ static void bcm5974_irq_trackpad(struct urb *urb)
exit: exit:
error = usb_submit_urb(dev->tp_urb, GFP_ATOMIC); error = usb_submit_urb(dev->tp_urb, GFP_ATOMIC);
if (error) if (error)
dev_err(&dev->input->dev, "trackpad urb failed: %d\n", error); dev_err(&idev->dev, "trackpad urb failed: %d\n", error);
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment