leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: comedi: drivers: replace le16_to_cpu() with usb_endpoint_maxp()

Browse Source 
Use macro introduced in commit 939f325f4a
("usb: add usb_endpoint_maxp() macro")

Signed-off-by: Cheah Kok Cheong <thrust73@gmail.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Cheah Kok Cheong 2016-07-22 23:29:39 +08:00 committed by Greg Kroah-Hartman
parent 49c9d6ad68
commit 62190d498c
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/comedi/drivers/dt9812.c
View File

@ -660,12 +660,12 @@ static int dt9812_find_endpoints(struct comedi_device *dev)
case 1: case 1:
dir = USB_DIR_OUT; dir = USB_DIR_OUT;
devpriv->cmd_wr.addr = ep->bEndpointAddress; devpriv->cmd_wr.addr = ep->bEndpointAddress;
devpriv->cmd_wr.size = le16_to_cpu(ep->wMaxPacketSize); devpriv->cmd_wr.size = usb_endpoint_maxp(ep);
break; break;
case 2: case 2:
dir = USB_DIR_IN; dir = USB_DIR_IN;
devpriv->cmd_rd.addr = ep->bEndpointAddress; devpriv->cmd_rd.addr = ep->bEndpointAddress;
devpriv->cmd_rd.size = le16_to_cpu(ep->wMaxPacketSize); devpriv->cmd_rd.size = usb_endpoint_maxp(ep);
break; break;
case 3: case 3:
/* unused write stream */ /* unused write stream */

4
drivers/staging/comedi/drivers/ni_usb6501.c
View File

@ -465,12 +465,12 @@ static int ni6501_alloc_usb_buffers(struct comedi_device *dev)
struct ni6501_private *devpriv = dev->private; struct ni6501_private *devpriv = dev->private;
size_t size; size_t size;
size = le16_to_cpu(devpriv->ep_rx->wMaxPacketSize); size = usb_endpoint_maxp(devpriv->ep_rx);
devpriv->usb_rx_buf = kzalloc(size, GFP_KERNEL); devpriv->usb_rx_buf = kzalloc(size, GFP_KERNEL);
if (!devpriv->usb_rx_buf) if (!devpriv->usb_rx_buf)
return -ENOMEM; return -ENOMEM;
size = le16_to_cpu(devpriv->ep_tx->wMaxPacketSize); size = usb_endpoint_maxp(devpriv->ep_tx);
devpriv->usb_tx_buf = kzalloc(size, GFP_KERNEL); devpriv->usb_tx_buf = kzalloc(size, GFP_KERNEL);
if (!devpriv->usb_tx_buf) { if (!devpriv->usb_tx_buf) {
kfree(devpriv->usb_rx_buf); kfree(devpriv->usb_rx_buf);

12
drivers/staging/comedi/drivers/vmk80xx.c
View File

@ -177,7 +177,7 @@ static void vmk80xx_do_bulk_msg(struct comedi_device *dev)
* The max packet size attributes of the K8061 * The max packet size attributes of the K8061
* input/output endpoints are identical * input/output endpoints are identical
*/ */
size = le16_to_cpu(devpriv->ep_tx->wMaxPacketSize); size = usb_endpoint_maxp(devpriv->ep_tx);
usb_bulk_msg(usb, tx_pipe, devpriv->usb_tx_buf, usb_bulk_msg(usb, tx_pipe, devpriv->usb_tx_buf,
size, NULL, devpriv->ep_tx->bInterval); size, NULL, devpriv->ep_tx->bInterval);
@ -199,7 +199,7 @@ static int vmk80xx_read_packet(struct comedi_device *dev)
ep = devpriv->ep_rx; ep = devpriv->ep_rx;
pipe = usb_rcvintpipe(usb, ep->bEndpointAddress); pipe = usb_rcvintpipe(usb, ep->bEndpointAddress);
return usb_interrupt_msg(usb, pipe, devpriv->usb_rx_buf, return usb_interrupt_msg(usb, pipe, devpriv->usb_rx_buf,
le16_to_cpu(ep->wMaxPacketSize), NULL, usb_endpoint_maxp(ep), NULL,
HZ * 10); HZ * 10);
} }
@ -220,7 +220,7 @@ static int vmk80xx_write_packet(struct comedi_device *dev, int cmd)
ep = devpriv->ep_tx; ep = devpriv->ep_tx;
pipe = usb_sndintpipe(usb, ep->bEndpointAddress); pipe = usb_sndintpipe(usb, ep->bEndpointAddress);
return usb_interrupt_msg(usb, pipe, devpriv->usb_tx_buf, return usb_interrupt_msg(usb, pipe, devpriv->usb_tx_buf,
le16_to_cpu(ep->wMaxPacketSize), NULL, usb_endpoint_maxp(ep), NULL,
HZ * 10); HZ * 10);
} }
@ -230,7 +230,7 @@ static int vmk80xx_reset_device(struct comedi_device *dev)
size_t size; size_t size;
int retval; int retval;
size = le16_to_cpu(devpriv->ep_tx->wMaxPacketSize); size = usb_endpoint_maxp(devpriv->ep_tx);
memset(devpriv->usb_tx_buf, 0, size); memset(devpriv->usb_tx_buf, 0, size);
retval = vmk80xx_write_packet(dev, VMK8055_CMD_RST); retval = vmk80xx_write_packet(dev, VMK8055_CMD_RST);
if (retval) if (retval)
@ -684,12 +684,12 @@ static int vmk80xx_alloc_usb_buffers(struct comedi_device *dev)
struct vmk80xx_private *devpriv = dev->private; struct vmk80xx_private *devpriv = dev->private;
size_t size; size_t size;
size = le16_to_cpu(devpriv->ep_rx->wMaxPacketSize); size = usb_endpoint_maxp(devpriv->ep_rx);
devpriv->usb_rx_buf = kzalloc(size, GFP_KERNEL); devpriv->usb_rx_buf = kzalloc(size, GFP_KERNEL);
if (!devpriv->usb_rx_buf) if (!devpriv->usb_rx_buf)
return -ENOMEM; return -ENOMEM;
size = le16_to_cpu(devpriv->ep_tx->wMaxPacketSize); size = usb_endpoint_maxp(devpriv->ep_tx);
devpriv->usb_tx_buf = kzalloc(size, GFP_KERNEL); devpriv->usb_tx_buf = kzalloc(size, GFP_KERNEL);
if (!devpriv->usb_tx_buf) { if (!devpriv->usb_tx_buf) {
kfree(devpriv->usb_rx_buf); kfree(devpriv->usb_rx_buf);