hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

USB: input: acecad.c: fix up dev_* messages 

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: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2012-05-04 15:33:04 -07:00
parent ab943ca894
commit 334698d435
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/input/tablet/acecad.c
View File

@ -51,6 +51,7 @@ struct usb_acecad {
char name[128]; char name[128];
char phys[64]; char phys[64];
struct usb_device *usbdev; struct usb_device *usbdev;
struct usb_interface *intf;
struct input_dev *input; struct input_dev *input;
struct urb *irq; struct urb *irq;
@ -63,6 +64,7 @@ static void usb_acecad_irq(struct urb *urb)
struct usb_acecad *acecad = urb->context; struct usb_acecad *acecad = urb->context;
unsigned char *data = acecad->data; unsigned char *data = acecad->data;
struct input_dev *dev = acecad->input; struct input_dev *dev = acecad->input;
struct usb_interface *intf = acecad->intf;
int prox, status; int prox, status;
switch (urb->status) { switch (urb->status) {
@ -73,11 +75,11 @@ static void usb_acecad_irq(struct urb *urb)
case -ENOENT: case -ENOENT:
case -ESHUTDOWN: case -ESHUTDOWN:
/* this urb is terminated, clean up */ /* this urb is terminated, clean up */
dev_dbg(&dev->dev, "%s - urb shutting down with status: %d\n", dev_dbg(&intf->dev, "%s - urb shutting down with status: %d\n",
__func__, urb->status); __func__, urb->status);
return; return;
default: default:
dev_dbg(&dev->dev, "%s - nonzero urb status received: %d\n", dev_dbg(&intf->dev, "%s - nonzero urb status received: %d\n",
__func__, urb->status); __func__, urb->status);
goto resubmit; goto resubmit;
} }
@ -107,7 +109,7 @@ static void usb_acecad_irq(struct urb *urb)
resubmit: resubmit:
status = usb_submit_urb(urb, GFP_ATOMIC); status = usb_submit_urb(urb, GFP_ATOMIC);
if (status) if (status)
dev_err(&dev->dev, dev_err(&intf->dev,
"can't resubmit intr, %s-%s/input0, status %d\n", "can't resubmit intr, %s-%s/input0, status %d\n",
acecad->usbdev->bus->bus_name, acecad->usbdev->bus->bus_name,
acecad->usbdev->devpath, status); acecad->usbdev->devpath, status);
@ -172,6 +174,7 @@ static int usb_acecad_probe(struct usb_interface *intf, const struct usb_device_
} }
acecad->usbdev = dev; acecad->usbdev = dev;
acecad->intf = intf;
acecad->input = input_dev; acecad->input = input_dev;
if (dev->manufacturer) if (dev->manufacturer)