Skip to content

Commit

Permalink
uwb: remove duplicate cpu_to_le16()
Browse files Browse the repository at this point in the history
These parameters should be passed as cpu endian because we change it to
little endian inside usb_control_msg().  On x86 cpu_to_le16() doesn't
do anything so either way works but I think the original code would break
on big endian systems.

I removed the masks as well because that usb_control_msg() parameters
are __u16 so we already only use the lower bits.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: David Vrabel <david.vrabel@csr.com>
  • Loading branch information
Dan Carpenter authored and David Vrabel committed Feb 25, 2010
1 parent 03806fa commit bcf59e2
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions drivers/uwb/i1480/dfu/usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,7 @@ int i1480_usb_write(struct i1480 *i1480, u32 memory_address,
result = usb_control_msg(
i1480_usb->usb_dev, usb_sndctrlpipe(i1480_usb->usb_dev, 0),
0xf0, USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
cpu_to_le16(memory_address & 0xffff),
cpu_to_le16((memory_address >> 16) & 0xffff),
memory_address, (memory_address >> 16),
i1480->cmd_buf, buffer_size, 100 /* FIXME: arbitrary */);
if (result < 0)
break;
Expand Down Expand Up @@ -166,8 +165,7 @@ int i1480_usb_read(struct i1480 *i1480, u32 addr, size_t size)
result = usb_control_msg(
i1480_usb->usb_dev, usb_rcvctrlpipe(i1480_usb->usb_dev, 0),
0xf0, USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
cpu_to_le16(itr_addr & 0xffff),
cpu_to_le16((itr_addr >> 16) & 0xffff),
itr_addr, (itr_addr >> 16),
i1480->cmd_buf + itr, itr_size,
100 /* FIXME: arbitrary */);
if (result < 0) {
Expand Down

0 comments on commit bcf59e2

Please sign in to comment.