[media] Minor cleanups for MCE USB

Signed-off-by: Sean Young <sean@mess.org>
Cc: Jarod Wilson <jarod@wilsonet.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/rc/mceusb.c b/drivers/media/rc/mceusb.c
index b7d3588fe87aff722504513ce86864fe17feef1e..f38d9a8c6880168a4c6256bdb227218c70123ed9 100644 (file)
--- a/drivers/media/rc/mceusb.c
+++ b/drivers/media/rc/mceusb.c
@@ -417,14 +417,12 @@ struct mceusb_dev {
        /* usb */
        struct usb_device *usbdev;
        struct urb *urb_in;
-       struct usb_endpoint_descriptor *usb_ep_in;
        struct usb_endpoint_descriptor *usb_ep_out;
 
        /* buffers and dma */
        unsigned char *buf_in;
        unsigned int len_in;
        dma_addr_t dma_in;
-       dma_addr_t dma_out;
 
        enum {
                CMD_HEADER = 0,
@@ -693,7 +691,7 @@ static void mceusb_dev_printdata(struct mceusb_dev *ir, char *buf,
                dev_info(dev, "Raw IR data, %d pulse/space samples\n", ir->rem);
 }
 
-static void mce_async_callback(struct urb *urb, struct pt_regs *regs)
+static void mce_async_callback(struct urb *urb)
 {
        struct mceusb_dev *ir;
        int len;
@@ -740,7 +738,7 @@ static void mce_request_packet(struct mceusb_dev *ir, unsigned char *data,
                pipe = usb_sndintpipe(ir->usbdev,
                                      ir->usb_ep_out->bEndpointAddress);
                usb_fill_int_urb(async_urb, ir->usbdev, pipe,
-                       async_buf, size, (usb_complete_t)mce_async_callback,
+                       async_buf, size, mce_async_callback,
                        ir, ir->usb_ep_out->bInterval);
                memcpy(async_buf, data, size);
 
@@ -1038,7 +1036,7 @@ static void mceusb_process_ir_data(struct mceusb_dev *ir, int buf_len)
        ir_raw_event_handle(ir->rc);
 }
 
-static void mceusb_dev_recv(struct urb *urb, struct pt_regs *regs)
+static void mceusb_dev_recv(struct urb *urb)
 {
        struct mceusb_dev *ir;
        int buf_len;
@@ -1338,7 +1336,6 @@ static int __devinit mceusb_dev_probe(struct usb_interface *intf,
        ir->model = model;
 
        /* Saving usb interface data for use by the transmitter routine */
-       ir->usb_ep_in = ep_in;
        ir->usb_ep_out = ep_out;
 
        if (dev->descriptor.iManufacturer
@@ -1356,8 +1353,8 @@ static int __devinit mceusb_dev_probe(struct usb_interface *intf,
                goto rc_dev_fail;
 
        /* wire up inbound data handler */
-       usb_fill_int_urb(ir->urb_in, dev, pipe, ir->buf_in,
-               maxp, (usb_complete_t) mceusb_dev_recv, ir, ep_in->bInterval);
+       usb_fill_int_urb(ir->urb_in, dev, pipe, ir->buf_in, maxp,
+                               mceusb_dev_recv, ir, ep_in->bInterval);
        ir->urb_in->transfer_dma = ir->dma_in;
        ir->urb_in->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;