aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/rc
diff options
context:
space:
mode:
authorJarod Wilson <jarod@redhat.com>2011-05-10 13:09:59 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-05-20 14:59:17 -0400
commit51ea62927e5bbb577360dd92c3f282edbf4cd3f8 (patch)
tree8351a145bed8659eced98f46c950bf632df79642 /drivers/media/rc
parent35e5ed7fe2326b7ea559ae91a4ee54cc0d8305d0 (diff)
[media] mceusb: passing ep to request_packet is redundant
Signed-off-by: Jarod Wilson <jarod@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/rc')
-rw-r--r--drivers/media/rc/mceusb.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/media/rc/mceusb.c b/drivers/media/rc/mceusb.c
index 5edd2cb8128a..ad927fcaa020 100644
--- a/drivers/media/rc/mceusb.c
+++ b/drivers/media/rc/mceusb.c
@@ -615,11 +615,10 @@ static void mce_async_callback(struct urb *urb, struct pt_regs *regs)
615} 615}
616 616
617/* request incoming or send outgoing usb packet - used to initialize remote */ 617/* request incoming or send outgoing usb packet - used to initialize remote */
618static void mce_request_packet(struct mceusb_dev *ir, 618static void mce_request_packet(struct mceusb_dev *ir, unsigned char *data,
619 struct usb_endpoint_descriptor *ep, 619 int size, int urb_type)
620 unsigned char *data, int size, int urb_type)
621{ 620{
622 int res; 621 int res, pipe;
623 struct urb *async_urb; 622 struct urb *async_urb;
624 struct device *dev = ir->dev; 623 struct device *dev = ir->dev;
625 unsigned char *async_buf; 624 unsigned char *async_buf;
@@ -639,10 +638,11 @@ static void mce_request_packet(struct mceusb_dev *ir,
639 } 638 }
640 639
641 /* outbound data */ 640 /* outbound data */
642 usb_fill_int_urb(async_urb, ir->usbdev, 641 pipe = usb_sndintpipe(ir->usbdev,
643 usb_sndintpipe(ir->usbdev, ep->bEndpointAddress), 642 ir->usb_ep_out->bEndpointAddress);
643 usb_fill_int_urb(async_urb, ir->usbdev, pipe,
644 async_buf, size, (usb_complete_t)mce_async_callback, 644 async_buf, size, (usb_complete_t)mce_async_callback,
645 ir, ep->bInterval); 645 ir, ir->usb_ep_out->bInterval);
646 memcpy(async_buf, data, size); 646 memcpy(async_buf, data, size);
647 647
648 } else if (urb_type == MCEUSB_RX) { 648 } else if (urb_type == MCEUSB_RX) {
@@ -670,12 +670,12 @@ static void mce_request_packet(struct mceusb_dev *ir,
670 670
671static void mce_async_out(struct mceusb_dev *ir, unsigned char *data, int size) 671static void mce_async_out(struct mceusb_dev *ir, unsigned char *data, int size)
672{ 672{
673 mce_request_packet(ir, ir->usb_ep_out, data, size, MCEUSB_TX); 673 mce_request_packet(ir, data, size, MCEUSB_TX);
674} 674}
675 675
676static void mce_sync_in(struct mceusb_dev *ir, unsigned char *data, int size) 676static void mce_sync_in(struct mceusb_dev *ir, unsigned char *data, int size)
677{ 677{
678 mce_request_packet(ir, ir->usb_ep_in, data, size, MCEUSB_RX); 678 mce_request_packet(ir, data, size, MCEUSB_RX);
679} 679}
680 680
681/* Send data out the IR blaster port(s) */ 681/* Send data out the IR blaster port(s) */