Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d81a427f authored by Cheah Kok Cheong's avatar Cheah Kok Cheong Committed by Greg Kroah-Hartman
Browse files

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



commit 62190d498c1d1cee970176840f24822fc14d27d1 upstream.

Use macro introduced in commit 939f325f
("usb: add usb_endpoint_maxp() macro")

Signed-off-by: default avatarCheah Kok Cheong <thrust73@gmail.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 58478143

drivers/staging/comedi/drivers/dt9812.c

+2 −2
Original line number Diff line number Diff line
@@ -717,12 +717,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 */

drivers/staging/comedi/drivers/ni_usb6501.c

+2 −2
Original line number Diff line number Diff line
@@ -469,12 +469,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)

		return -ENOMEM;

drivers/staging/comedi/drivers/vmk80xx.c

+6 −6
Original line number Diff line number Diff line
@@ -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)
@@ -687,12 +687,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)

		return -ENOMEM;