aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJarod Wilson <jarod@redhat.com>2010-08-02 17:21:06 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-08-08 22:42:58 -0400
commit7c294402d58e22bb760c0e1a825eea5d582a8f2d (patch)
tree93259b78154af937973e5983b70151d0cdfae3ee /drivers
parent82ce67bf262b3f47ecb5a0ca31cace8ac72b7c98 (diff)
V4L/DVB: IR/mceusb: less generic callback name and remove cruft
Signed-off-by: Jarod Wilson <jarod@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/IR/mceusb.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/IR/mceusb.c b/drivers/media/IR/mceusb.c
index 65b073878169..ac6bb2c01a48 100644
--- a/drivers/media/IR/mceusb.c
+++ b/drivers/media/IR/mceusb.c
@@ -427,7 +427,7 @@ static void mceusb_dev_printdata(struct mceusb_dev *ir, char *buf,
427 } 427 }
428} 428}
429 429
430static void usb_async_callback(struct urb *urb, struct pt_regs *regs) 430static void mce_async_callback(struct urb *urb, struct pt_regs *regs)
431{ 431{
432 struct mceusb_dev *ir; 432 struct mceusb_dev *ir;
433 int len; 433 int len;
@@ -476,7 +476,7 @@ static void mce_request_packet(struct mceusb_dev *ir,
476 /* outbound data */ 476 /* outbound data */
477 usb_fill_int_urb(async_urb, ir->usbdev, 477 usb_fill_int_urb(async_urb, ir->usbdev,
478 usb_sndintpipe(ir->usbdev, ep->bEndpointAddress), 478 usb_sndintpipe(ir->usbdev, ep->bEndpointAddress),
479 async_buf, size, (usb_complete_t) usb_async_callback, 479 async_buf, size, (usb_complete_t)mce_async_callback,
480 ir, ep->bInterval); 480 ir, ep->bInterval);
481 memcpy(async_buf, data, size); 481 memcpy(async_buf, data, size);
482 482
@@ -919,7 +919,6 @@ static int __devinit mceusb_dev_probe(struct usb_interface *intf,
919 struct usb_endpoint_descriptor *ep = NULL; 919 struct usb_endpoint_descriptor *ep = NULL;
920 struct usb_endpoint_descriptor *ep_in = NULL; 920 struct usb_endpoint_descriptor *ep_in = NULL;
921 struct usb_endpoint_descriptor *ep_out = NULL; 921 struct usb_endpoint_descriptor *ep_out = NULL;
922 struct usb_host_config *config;
923 struct mceusb_dev *ir = NULL; 922 struct mceusb_dev *ir = NULL;
924 int pipe, maxp, i; 923 int pipe, maxp, i;
925 char buf[63], name[128] = ""; 924 char buf[63], name[128] = "";
@@ -929,7 +928,6 @@ static int __devinit mceusb_dev_probe(struct usb_interface *intf,
929 928
930 dev_dbg(&intf->dev, ": %s called\n", __func__); 929 dev_dbg(&intf->dev, ": %s called\n", __func__);
931 930
932 config = dev->actconfig;
933 idesc = intf->cur_altsetting; 931 idesc = intf->cur_altsetting;
934 932
935 is_gen3 = usb_match_id(intf, gen3_list) ? 1 : 0; 933 is_gen3 = usb_match_id(intf, gen3_list) ? 1 : 0;