Skip to content

Commit

Permalink
USB: bcm5974.c: remove dbg() usage
Browse files Browse the repository at this point in the history
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Greg Kroah-Hartman committed May 2, 2012
1 parent 67946d1 commit bd02876
Showing 1 changed file with 10 additions and 6 deletions.
16 changes: 10 additions & 6 deletions drivers/input/mouse/bcm5974.c
Original file line number Diff line number Diff line change
Expand Up @@ -631,6 +631,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 input_dev *idev = dev->input;
int error;

switch (urb->status) {
Expand All @@ -640,10 +641,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(&idev->dev, "button urb shutting down: %d\n",
urb->status);
return;
default:
dbg("bcm5974: button urb status: %d", urb->status);
dev_dbg(&idev->dev, "button urb status: %d\n", urb->status);
goto exit;
}

Expand All @@ -654,12 +656,13 @@ static void bcm5974_irq_button(struct urb *urb)
exit:
error = usb_submit_urb(dev->bt_urb, GFP_ATOMIC);
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)
{
struct bcm5974 *dev = urb->context;
struct input_dev *idev = dev->input;
int error;

switch (urb->status) {
Expand All @@ -669,10 +672,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(&idev->dev, "trackpad urb shutting down: %d\n",
urb->status);
return;
default:
dbg("bcm5974: trackpad urb status: %d", urb->status);
dev_dbg(&idev->dev, "trackpad urb status: %d\n", urb->status);
goto exit;
}

Expand All @@ -687,7 +691,7 @@ static void bcm5974_irq_trackpad(struct urb *urb)
exit:
error = usb_submit_urb(dev->tp_urb, GFP_ATOMIC);
if (error)
dev_err(&dev->input->dev, "trackpad urb failed: %d\n", error);
dev_err(&idev->dev, "trackpad urb failed: %d\n", error);
}

/*
Expand Down

0 comments on commit bd02876

Please sign in to comment.