diff options
author | Dan Carpenter <error27@gmail.com> | 2010-02-23 07:04:23 -0500 |
---|---|---|
committer | David Vrabel <david.vrabel@csr.com> | 2010-02-25 08:38:51 -0500 |
commit | bcf59e2c4dea780e4abf48d5e673f5d79f9ee064 (patch) | |
tree | 3bddb355fdadef0c3be34cadcbdf9dbfbfc27acd | |
parent | 03806fa20f6a081493a731a4b18ea66317f9f947 (diff) |
uwb: remove duplicate cpu_to_le16()
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>
-rw-r--r-- | drivers/uwb/i1480/dfu/usb.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/uwb/i1480/dfu/usb.c b/drivers/uwb/i1480/dfu/usb.c index a6a93755627e..a99e211a1b87 100644 --- a/drivers/uwb/i1480/dfu/usb.c +++ b/drivers/uwb/i1480/dfu/usb.c | |||
@@ -120,8 +120,7 @@ int i1480_usb_write(struct i1480 *i1480, u32 memory_address, | |||
120 | result = usb_control_msg( | 120 | result = usb_control_msg( |
121 | i1480_usb->usb_dev, usb_sndctrlpipe(i1480_usb->usb_dev, 0), | 121 | i1480_usb->usb_dev, usb_sndctrlpipe(i1480_usb->usb_dev, 0), |
122 | 0xf0, USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, | 122 | 0xf0, USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, |
123 | cpu_to_le16(memory_address & 0xffff), | 123 | memory_address, (memory_address >> 16), |
124 | cpu_to_le16((memory_address >> 16) & 0xffff), | ||
125 | i1480->cmd_buf, buffer_size, 100 /* FIXME: arbitrary */); | 124 | i1480->cmd_buf, buffer_size, 100 /* FIXME: arbitrary */); |
126 | if (result < 0) | 125 | if (result < 0) |
127 | break; | 126 | break; |
@@ -166,8 +165,7 @@ int i1480_usb_read(struct i1480 *i1480, u32 addr, size_t size) | |||
166 | result = usb_control_msg( | 165 | result = usb_control_msg( |
167 | i1480_usb->usb_dev, usb_rcvctrlpipe(i1480_usb->usb_dev, 0), | 166 | i1480_usb->usb_dev, usb_rcvctrlpipe(i1480_usb->usb_dev, 0), |
168 | 0xf0, USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, | 167 | 0xf0, USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, |
169 | cpu_to_le16(itr_addr & 0xffff), | 168 | itr_addr, (itr_addr >> 16), |
170 | cpu_to_le16((itr_addr >> 16) & 0xffff), | ||
171 | i1480->cmd_buf + itr, itr_size, | 169 | i1480->cmd_buf + itr, itr_size, |
172 | 100 /* FIXME: arbitrary */); | 170 | 100 /* FIXME: arbitrary */); |
173 | if (result < 0) { | 171 | if (result < 0) { |