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

Use macro introduced in commit 939f325f4a0f
("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>

diff --git a/drivers/staging/comedi/drivers/dt9812.c b/drivers/staging/comedi/drivers/dt9812.c
index 3295bb4ac8c4cf5a45606569bbfd940b9ab0da3c..7ebca862ecaa3204224b678a47ddf613806b4786 100644 (file)
--- a/drivers/staging/comedi/drivers/dt9812.c
+++ b/drivers/staging/comedi/drivers/dt9812.c
@@ -660,12 +660,12 @@ static int dt9812_find_endpoints(struct comedi_device *dev)
                case 1:
                        dir = USB_DIR_OUT;
                        devpriv->cmd_wr.addr = ep->bEndpointAddress;
-                       devpriv->cmd_wr.size = le16_to_cpu(ep->wMaxPacketSize);
+                       devpriv->cmd_wr.size = usb_endpoint_maxp(ep);
                        break;
                case 2:
                        dir = USB_DIR_IN;
                        devpriv->cmd_rd.addr = ep->bEndpointAddress;
-                       devpriv->cmd_rd.size = le16_to_cpu(ep->wMaxPacketSize);
+                       devpriv->cmd_rd.size = usb_endpoint_maxp(ep);
                        break;
                case 3:
                        /* unused write stream */

diff --git a/drivers/staging/comedi/drivers/ni_usb6501.c b/drivers/staging/comedi/drivers/ni_usb6501.c
index 95b537a8ecdb13b17e9d753f22a6c0dd04c60f99..5036eebb9162ef90bd4faaf4eb7508a6926f762a 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_usb6501.c
+++ b/drivers/staging/comedi/drivers/ni_usb6501.c
@@ -465,12 +465,12 @@ static int ni6501_alloc_usb_buffers(struct comedi_device *dev)
        struct ni6501_private *devpriv = dev->private;
        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);
        if (!devpriv->usb_rx_buf)
                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);
        if (!devpriv->usb_tx_buf) {
                kfree(devpriv->usb_rx_buf);

diff --git a/drivers/staging/comedi/drivers/vmk80xx.c b/drivers/staging/comedi/drivers/vmk80xx.c
index 8c7393ef762d911435d709cb2d74bdf70c156aee..a004aed0147a526fa3732d1d8718be3e2957ef10 100644 (file)
--- a/drivers/staging/comedi/drivers/vmk80xx.c
+++ b/drivers/staging/comedi/drivers/vmk80xx.c
@@ -177,7 +177,7 @@ static void vmk80xx_do_bulk_msg(struct comedi_device *dev)
         * The max packet size attributes of the K8061
         * 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,
                     size, NULL, devpriv->ep_tx->bInterval);
@@ -199,7 +199,7 @@ static int vmk80xx_read_packet(struct comedi_device *dev)
        ep = devpriv->ep_rx;
        pipe = usb_rcvintpipe(usb, ep->bEndpointAddress);
        return usb_interrupt_msg(usb, pipe, devpriv->usb_rx_buf,
-                                le16_to_cpu(ep->wMaxPacketSize), NULL,
+                                usb_endpoint_maxp(ep), NULL,
                                 HZ * 10);
 }
 
@@ -220,7 +220,7 @@ static int vmk80xx_write_packet(struct comedi_device *dev, int cmd)
        ep = devpriv->ep_tx;
        pipe = usb_sndintpipe(usb, ep->bEndpointAddress);
        return usb_interrupt_msg(usb, pipe, devpriv->usb_tx_buf,
-                                le16_to_cpu(ep->wMaxPacketSize), NULL,
+                                usb_endpoint_maxp(ep), NULL,
                                 HZ * 10);
 }
 
@@ -230,7 +230,7 @@ static int vmk80xx_reset_device(struct comedi_device *dev)
        size_t size;
        int retval;
 
-       size = le16_to_cpu(devpriv->ep_tx->wMaxPacketSize);
+       size = usb_endpoint_maxp(devpriv->ep_tx);
        memset(devpriv->usb_tx_buf, 0, size);
        retval = vmk80xx_write_packet(dev, VMK8055_CMD_RST);
        if (retval)
@@ -684,12 +684,12 @@ static int vmk80xx_alloc_usb_buffers(struct comedi_device *dev)
        struct vmk80xx_private *devpriv = dev->private;
        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);
        if (!devpriv->usb_rx_buf)
                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);
        if (!devpriv->usb_tx_buf) {
                kfree(devpriv->usb_rx_buf);