forked from rubenslte/android_kernel_samsung_msm8226
USB: input: gtco.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:
committed by
Francescodario Cuzzocrea
parent
c0fccbd467
commit
9b773bfbba
@@ -108,6 +108,7 @@ struct gtco {
|
||||
|
||||
struct input_dev *inputdevice; /* input device struct pointer */
|
||||
struct usb_device *usbdev; /* the usb device for this device */
|
||||
struct usb_interface *intf; /* the usb interface for this device */
|
||||
struct urb *urbinfo; /* urb for incoming reports */
|
||||
dma_addr_t buf_dma; /* dma addr of the data buffer*/
|
||||
unsigned char * buffer; /* databuffer for reports */
|
||||
@@ -202,6 +203,7 @@ struct hid_descriptor
|
||||
static void parse_hid_report_descriptor(struct gtco *device, char * report,
|
||||
int length)
|
||||
{
|
||||
struct device *ddev = &device->intf->dev;
|
||||
int x, i = 0;
|
||||
|
||||
/* Tag primitive vars */
|
||||
@@ -717,8 +719,9 @@ static void gtco_urb_callback(struct urb *urbinfo)
|
||||
* the rest as 0
|
||||
*/
|
||||
val = device->buffer[5] & MASK_BUTTON;
|
||||
dbg("======>>>>>>REPORT 1: val 0x%X(%d)",
|
||||
val, val);
|
||||
dev_dbg(&device->intf->dev,
|
||||
"======>>>>>>REPORT 1: val 0x%X(%d)\n",
|
||||
val, val);
|
||||
|
||||
/*
|
||||
* We don't apply any meaning to the button
|
||||
@@ -811,7 +814,8 @@ static void gtco_urb_callback(struct urb *urbinfo)
|
||||
resubmit:
|
||||
rc = usb_submit_urb(urbinfo, GFP_ATOMIC);
|
||||
if (rc != 0)
|
||||
err("usb_submit_urb failed rc=0x%x", rc);
|
||||
dev_err(&device->intf->dev,
|
||||
"usb_submit_urb failed rc=0x%x\n", rc);
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -850,7 +854,7 @@ static int gtco_probe(struct usb_interface *usbinterface,
|
||||
gtco->inputdevice = input_dev;
|
||||
|
||||
/* Save interface information */
|
||||
gtco->usbdev = usb_get_dev(interface_to_usbdev(usbinterface));
|
||||
gtco->intf = usbinterface;
|
||||
|
||||
/* Allocate some data for incoming reports */
|
||||
gtco->buffer = usb_alloc_coherent(gtco->usbdev, REPORT_MAX_SIZE,
|
||||
|
||||
Reference in New Issue
Block a user