diff options
author | Jarod Wilson | 2010-08-02 23:21:06 +0200 |
---|---|---|
committer | Mauro Carvalho Chehab | 2010-08-09 04:42:58 +0200 |
commit | 7c294402d58e22bb760c0e1a825eea5d582a8f2d (patch) | |
tree | 93259b78154af937973e5983b70151d0cdfae3ee /drivers/media | |
parent | V4L/DVB: staging/lirc: fix non-CONFIG_MODULES build horkage (diff) | |
download | kernel-qcow2-linux-7c294402d58e22bb760c0e1a825eea5d582a8f2d.tar.gz kernel-qcow2-linux-7c294402d58e22bb760c0e1a825eea5d582a8f2d.tar.xz kernel-qcow2-linux-7c294402d58e22bb760c0e1a825eea5d582a8f2d.zip |
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/media')
-rw-r--r-- | drivers/media/IR/mceusb.c | 6 |
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, } } -static void usb_async_callback(struct urb *urb, struct pt_regs *regs) +static void mce_async_callback(struct urb *urb, struct pt_regs *regs) { struct mceusb_dev *ir; int len; @@ -476,7 +476,7 @@ static void mce_request_packet(struct mceusb_dev *ir, /* outbound data */ usb_fill_int_urb(async_urb, ir->usbdev, usb_sndintpipe(ir->usbdev, ep->bEndpointAddress), - async_buf, size, (usb_complete_t) usb_async_callback, + async_buf, size, (usb_complete_t)mce_async_callback, ir, ep->bInterval); memcpy(async_buf, data, size); @@ -919,7 +919,6 @@ static int __devinit mceusb_dev_probe(struct usb_interface *intf, struct usb_endpoint_descriptor *ep = NULL; struct usb_endpoint_descriptor *ep_in = NULL; struct usb_endpoint_descriptor *ep_out = NULL; - struct usb_host_config *config; struct mceusb_dev *ir = NULL; int pipe, maxp, i; char buf[63], name[128] = ""; @@ -929,7 +928,6 @@ static int __devinit mceusb_dev_probe(struct usb_interface *intf, dev_dbg(&intf->dev, ": %s called\n", __func__); - config = dev->actconfig; idesc = intf->cur_altsetting; is_gen3 = usb_match_id(intf, gen3_list) ? 1 : 0; |