Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[media] redrat3: missing endian conversions and warnings

Spotted by sparse.

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

authored by

Sean Young and committed by
Mauro Carvalho Chehab
fa7b9ac2 4c055a5a

+12 -59
+12 -59
drivers/media/rc/redrat3.c
··· 54 54 #include <media/rc-core.h> 55 55 56 56 /* Driver Information */ 57 - #define DRIVER_VERSION "0.70" 58 57 #define DRIVER_AUTHOR "Jarod Wilson <jarod@redhat.com>" 59 58 #define DRIVER_AUTHOR2 "The Dweller, Stephen Cox" 60 59 #define DRIVER_DESC "RedRat3 USB IR Transceiver Driver" ··· 198 199 199 200 /* the send endpoint */ 200 201 struct usb_endpoint_descriptor *ep_out; 201 - /* the buffer to send data */ 202 - unsigned char *bulk_out_buf; 203 - /* the urb used to send data */ 204 - struct urb *write_urb; 205 202 206 203 /* usb dma */ 207 204 dma_addr_t dma_in; 208 - dma_addr_t dma_out; 209 205 210 206 /* rx signal timeout timer */ 211 207 struct timer_list rx_timeout; ··· 233 239 234 240 rr3_ftr(rr3->dev, "Entering %s\n", __func__); 235 241 236 - memset(rr3->bulk_in_buf, 0, rr3->ep_in->wMaxPacketSize); 237 242 res = usb_submit_urb(rr3->read_urb, GFP_ATOMIC); 238 243 if (res) 239 244 rr3_dbg(rr3->dev, "%s: receive request FAILED! " ··· 361 368 { 362 369 DEFINE_IR_RAW_EVENT(rawir); 363 370 struct device *dev; 364 - int i, trailer = 0; 371 + unsigned i, trailer = 0; 365 372 unsigned sig_size, single_len, offset, val; 366 373 unsigned long delay; 367 374 u32 mod_freq; ··· 503 510 { 504 511 rr3_ftr(rr3->dev, "%s cleaning up\n", __func__); 505 512 usb_kill_urb(rr3->read_urb); 506 - usb_kill_urb(rr3->write_urb); 507 513 508 514 usb_free_urb(rr3->read_urb); 509 - usb_free_urb(rr3->write_urb); 510 515 511 - usb_free_coherent(udev, rr3->ep_in->wMaxPacketSize, 516 + usb_free_coherent(udev, le16_to_cpu(rr3->ep_in->wMaxPacketSize), 512 517 rr3->bulk_in_buf, rr3->dma_in); 513 - usb_free_coherent(udev, rr3->ep_out->wMaxPacketSize, 514 - rr3->bulk_out_buf, rr3->dma_out); 515 518 516 519 kfree(rr3); 517 520 } ··· 555 566 rxpipe = usb_rcvctrlpipe(udev, 0); 556 567 txpipe = usb_sndctrlpipe(udev, 0); 557 568 558 - val = kzalloc(len, GFP_KERNEL); 569 + val = kmalloc(len, GFP_KERNEL); 559 570 if (!val) { 560 571 dev_err(dev, "Memory allocation failure\n"); 561 572 return; ··· 609 620 rr3_ftr(rr3->dev, "Exiting %s\n", __func__); 610 621 } 611 622 612 - static void redrat3_read_packet_start(struct redrat3_dev *rr3, int len) 623 + static void redrat3_read_packet_start(struct redrat3_dev *rr3, unsigned len) 613 624 { 614 625 struct redrat3_header *header = rr3->bulk_in_buf; 615 626 unsigned pktlen, pkttype; ··· 648 659 } 649 660 } 650 661 651 - static void redrat3_read_packet_continue(struct redrat3_dev *rr3, int len) 662 + static void redrat3_read_packet_continue(struct redrat3_dev *rr3, unsigned len) 652 663 { 653 664 void *irdata = &rr3->irdata; 654 665 ··· 668 679 } 669 680 670 681 /* gather IR data from incoming urb, process it when we have enough */ 671 - static int redrat3_get_ir_data(struct redrat3_dev *rr3, int len) 682 + static int redrat3_get_ir_data(struct redrat3_dev *rr3, unsigned len) 672 683 { 673 684 struct device *dev = rr3->dev; 674 685 unsigned pkttype; ··· 744 755 } 745 756 } 746 757 747 - static void redrat3_write_bulk_callback(struct urb *urb) 748 - { 749 - struct redrat3_dev *rr3; 750 - int len; 751 - 752 - if (!urb) 753 - return; 754 - 755 - rr3 = urb->context; 756 - if (rr3) { 757 - len = urb->actual_length; 758 - rr3_ftr(rr3->dev, "%s: called (status=%d len=%d)\n", 759 - __func__, urb->status, len); 760 - } 761 - } 762 - 763 758 static u16 mod_freq_to_val(unsigned int mod_freq) 764 759 { 765 760 int mult = 6000000; ··· 772 799 struct redrat3_dev *rr3 = rcdev->priv; 773 800 struct device *dev = rr3->dev; 774 801 struct redrat3_irdata *irdata = NULL; 775 - int i, ret, ret_len; 802 + int ret, ret_len; 776 803 int lencheck, cur_sample_len, pipe; 777 804 int *sample_lens = NULL; 778 805 u8 curlencheck = 0; 779 - int sendbuf_len; 806 + unsigned i, sendbuf_len; 780 807 781 808 rr3_ftr(dev, "Entering %s\n", __func__); 782 809 ··· 988 1015 } 989 1016 990 1017 rr3->ep_in = ep_in; 991 - rr3->bulk_in_buf = usb_alloc_coherent(udev, ep_in->wMaxPacketSize, 992 - GFP_ATOMIC, &rr3->dma_in); 1018 + rr3->bulk_in_buf = usb_alloc_coherent(udev, 1019 + le16_to_cpu(ep_in->wMaxPacketSize), GFP_ATOMIC, &rr3->dma_in); 993 1020 if (!rr3->bulk_in_buf) { 994 1021 dev_err(dev, "Read buffer allocation failure\n"); 995 1022 goto error; 996 1023 } 997 1024 998 1025 pipe = usb_rcvbulkpipe(udev, ep_in->bEndpointAddress); 999 - usb_fill_bulk_urb(rr3->read_urb, udev, pipe, 1000 - rr3->bulk_in_buf, ep_in->wMaxPacketSize, 1001 - redrat3_handle_async, rr3); 1002 - 1003 - /* set up bulk-out endpoint*/ 1004 - rr3->write_urb = usb_alloc_urb(0, GFP_KERNEL); 1005 - if (!rr3->write_urb) { 1006 - dev_err(dev, "Write urb allocation failure\n"); 1007 - goto error; 1008 - } 1026 + usb_fill_bulk_urb(rr3->read_urb, udev, pipe, rr3->bulk_in_buf, 1027 + le16_to_cpu(ep_in->wMaxPacketSize), redrat3_handle_async, rr3); 1009 1028 1010 1029 rr3->ep_out = ep_out; 1011 - rr3->bulk_out_buf = usb_alloc_coherent(udev, ep_out->wMaxPacketSize, 1012 - GFP_ATOMIC, &rr3->dma_out); 1013 - if (!rr3->bulk_out_buf) { 1014 - dev_err(dev, "Write buffer allocation failure\n"); 1015 - goto error; 1016 - } 1017 - 1018 - pipe = usb_sndbulkpipe(udev, ep_out->bEndpointAddress); 1019 - usb_fill_bulk_urb(rr3->write_urb, udev, pipe, 1020 - rr3->bulk_out_buf, ep_out->wMaxPacketSize, 1021 - redrat3_write_bulk_callback, rr3); 1022 - 1023 1030 rr3->udev = udev; 1024 1031 1025 1032 redrat3_reset(rr3);