Skip to content

Commit

Permalink
USB: input: bcm5974.c: fix up dev_* messages
Browse files Browse the repository at this point in the history 
Previously I had made the struct device point to the input device, but
after talking with Dmitry, he said that the USB device would make more
sense for this driver to point to.  So converted it to use that 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 4, 2012
1 parent 2d744b0 commit ab943ca
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions drivers/input/mouse/bcm5974.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,7 @@ static int bcm5974_wellspring_mode(struct bcm5974 *dev, bool on)
int retval = 0, size;

if (!data) {
dev_err(&dev->input->dev, "out of memory\n");
dev_err(&dev->intf->dev, "out of memory\n");
retval = -ENOMEM;
goto out;
}
Expand All @@ -597,7 +597,7 @@ static int bcm5974_wellspring_mode(struct bcm5974 *dev, bool on)
BCM5974_WELLSPRING_MODE_REQUEST_INDEX, data, 8, 5000);

if (size != 8) {
dev_err(&dev->input->dev, "could not read from device\n");
dev_err(&dev->intf->dev, "could not read from device\n");
retval = -EIO;
goto out;
}
Expand All @@ -615,7 +615,7 @@ static int bcm5974_wellspring_mode(struct bcm5974 *dev, bool on)
BCM5974_WELLSPRING_MODE_REQUEST_INDEX, data, 8, 5000);

if (size != 8) {
dev_err(&dev->input->dev, "could not write to device\n");
dev_err(&dev->intf->dev, "could not write to device\n");
retval = -EIO;
goto out;
}
Expand All @@ -631,7 +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;
struct usb_interface *intf = dev->intf;
int error;

switch (urb->status) {
Expand All @@ -641,11 +641,11 @@ static void bcm5974_irq_button(struct urb *urb)
case -ECONNRESET:
case -ENOENT:
case -ESHUTDOWN:
dev_dbg(&idev->dev, "button urb shutting down: %d\n",
dev_dbg(&intf->dev, "button urb shutting down: %d\n",
urb->status);
return;
default:
dev_dbg(&idev->dev, "button urb status: %d\n", urb->status);
dev_dbg(&intf->dev, "button urb status: %d\n", urb->status);
goto exit;
}

Expand All @@ -656,13 +656,13 @@ static void bcm5974_irq_button(struct urb *urb)
exit:
error = usb_submit_urb(dev->bt_urb, GFP_ATOMIC);
if (error)
dev_err(&idev->dev, "button urb failed: %d\n", 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 input_dev *idev = dev->input;
struct usb_interface *intf = dev->intf;
int error;

switch (urb->status) {
Expand All @@ -672,11 +672,11 @@ static void bcm5974_irq_trackpad(struct urb *urb)
case -ECONNRESET:
case -ENOENT:
case -ESHUTDOWN:
dev_dbg(&idev->dev, "trackpad urb shutting down: %d\n",
dev_dbg(&intf->dev, "trackpad urb shutting down: %d\n",
urb->status);
return;
default:
dev_dbg(&idev->dev, "trackpad urb status: %d\n", urb->status);
dev_dbg(&intf->dev, "trackpad urb status: %d\n", urb->status);
goto exit;
}

Expand All @@ -691,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(&idev->dev, "trackpad urb failed: %d\n", error);
dev_err(&intf->dev, "trackpad urb failed: %d\n", error);
}

/*
Expand Down

0 comments on commit ab943ca

Please sign in to comment.