Commit 551509d2 authored by Harvey Harrison's avatar Harvey Harrison Committed by Greg Kroah-Hartman
Browse files

USB: replace uses of __constant_{endian} 



The base versions handle constant folding now.

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent a78b4282

drivers/usb/core/hcd.c

+1 −1
Original line number Diff line number Diff line
@@ -901,7 +901,7 @@ static int register_root_hub(struct usb_hcd *hcd) 


	mutex_lock(&usb_bus_list_lock);



	usb_dev->ep0.desc.wMaxPacketSize = __constant_cpu_to_le16(64);

	usb_dev->ep0.desc.wMaxPacketSize = cpu_to_le16(64);

	retval = usb_get_device_descriptor(usb_dev, USB_DT_DEVICE_SIZE);

	if (retval != sizeof usb_dev->descriptor) {

		mutex_unlock(&usb_bus_list_lock);

drivers/usb/core/hub.c

+4 −4
Original line number Diff line number Diff line
@@ -2471,20 +2471,20 @@ hub_port_init (struct usb_hub *hub, struct usb_device *udev, int port1, 
	 */

	switch (udev->speed) {

	case USB_SPEED_VARIABLE:	/* fixed at 512 */

		udev->ep0.desc.wMaxPacketSize = __constant_cpu_to_le16(512);

		udev->ep0.desc.wMaxPacketSize = cpu_to_le16(512);

		break;

	case USB_SPEED_HIGH:		/* fixed at 64 */

		udev->ep0.desc.wMaxPacketSize = __constant_cpu_to_le16(64);

		udev->ep0.desc.wMaxPacketSize = cpu_to_le16(64);

		break;

	case USB_SPEED_FULL:		/* 8, 16, 32, or 64 */

		/* to determine the ep0 maxpacket size, try to read

		 * the device descriptor to get bMaxPacketSize0 and

		 * then correct our initial guess.

		 */

		udev->ep0.desc.wMaxPacketSize = __constant_cpu_to_le16(64);

		udev->ep0.desc.wMaxPacketSize = cpu_to_le16(64);

		break;

	case USB_SPEED_LOW:		/* fixed at 8 */

		udev->ep0.desc.wMaxPacketSize = __constant_cpu_to_le16(8);

		udev->ep0.desc.wMaxPacketSize = cpu_to_le16(8);

		break;

	default:

		goto fail;

drivers/usb/gadget/amd5536udc.c

+1 −1
Original line number Diff line number Diff line
@@ -551,7 +551,7 @@ udc_alloc_request(struct usb_ep *usbep, gfp_t gfp) 
		dma_desc->status = AMD_ADDBITS(dma_desc->status,

						UDC_DMA_STP_STS_BS_HOST_BUSY,

						UDC_DMA_STP_STS_BS);

		dma_desc->bufptr = __constant_cpu_to_le32(DMA_DONT_USE);

		dma_desc->bufptr = cpu_to_le32(DMA_DONT_USE);

		req->td_data = dma_desc;

		req->td_data_last = NULL;

		req->chain_len = 1;

drivers/usb/gadget/atmel_usba_udc.c

+10 −10
Original line number Diff line number Diff line
@@ -1017,7 +1017,7 @@ static struct usb_endpoint_descriptor usba_ep0_desc = { 
	.bDescriptorType = USB_DT_ENDPOINT,

	.bEndpointAddress = 0,

	.bmAttributes = USB_ENDPOINT_XFER_CONTROL,

	.wMaxPacketSize = __constant_cpu_to_le16(64),

	.wMaxPacketSize = cpu_to_le16(64),

	/* FIXME: I have no idea what to put here */

	.bInterval = 1,

};
@@ -1207,21 +1207,21 @@ static int do_test_mode(struct usba_udc *udc) 
/* Avoid overly long expressions */

static inline bool feature_is_dev_remote_wakeup(struct usb_ctrlrequest *crq)

{

	if (crq->wValue == __constant_cpu_to_le16(USB_DEVICE_REMOTE_WAKEUP))

	if (crq->wValue == cpu_to_le16(USB_DEVICE_REMOTE_WAKEUP))

		return true;

	return false;

}



static inline bool feature_is_dev_test_mode(struct usb_ctrlrequest *crq)

{

	if (crq->wValue == __constant_cpu_to_le16(USB_DEVICE_TEST_MODE))

	if (crq->wValue == cpu_to_le16(USB_DEVICE_TEST_MODE))

		return true;

	return false;

}



static inline bool feature_is_ep_halt(struct usb_ctrlrequest *crq)

{

	if (crq->wValue == __constant_cpu_to_le16(USB_ENDPOINT_HALT))

	if (crq->wValue == cpu_to_le16(USB_ENDPOINT_HALT))

		return true;

	return false;

}
@@ -1239,7 +1239,7 @@ static int handle_ep0_setup(struct usba_udc *udc, struct usba_ep *ep, 
			status = cpu_to_le16(udc->devstatus);

		} else if (crq->bRequestType

				== (USB_DIR_IN | USB_RECIP_INTERFACE)) {

			status = __constant_cpu_to_le16(0);

			status = cpu_to_le16(0);

		} else if (crq->bRequestType

				== (USB_DIR_IN | USB_RECIP_ENDPOINT)) {

			struct usba_ep *target;
@@ -1250,12 +1250,12 @@ static int handle_ep0_setup(struct usba_udc *udc, struct usba_ep *ep, 


			status = 0;

			if (is_stalled(udc, target))

				status |= __constant_cpu_to_le16(1);

				status |= cpu_to_le16(1);

		} else

			goto delegate;



		/* Write directly to the FIFO. No queueing is done. */

		if (crq->wLength != __constant_cpu_to_le16(sizeof(status)))

		if (crq->wLength != cpu_to_le16(sizeof(status)))

			goto stall;

		ep->state = DATA_STAGE_IN;

		__raw_writew(status, ep->fifo);
@@ -1274,7 +1274,7 @@ static int handle_ep0_setup(struct usba_udc *udc, struct usba_ep *ep, 
		} else if (crq->bRequestType == USB_RECIP_ENDPOINT) {

			struct usba_ep *target;



			if (crq->wLength != __constant_cpu_to_le16(0)

			if (crq->wLength != cpu_to_le16(0)

					|| !feature_is_ep_halt(crq))

				goto stall;

			target = get_ep_by_addr(udc, le16_to_cpu(crq->wIndex));
@@ -1308,7 +1308,7 @@ static int handle_ep0_setup(struct usba_udc *udc, struct usba_ep *ep, 
		} else if (crq->bRequestType == USB_RECIP_ENDPOINT) {

			struct usba_ep *target;



			if (crq->wLength != __constant_cpu_to_le16(0)

			if (crq->wLength != cpu_to_le16(0)

					|| !feature_is_ep_halt(crq))

				goto stall;
@@ -1514,7 +1514,7 @@ static void usba_control_irq(struct usba_udc *udc, struct usba_ep *ep) 
			 */

			ep->state = DATA_STAGE_IN;

		} else {

			if (crq.crq.wLength != __constant_cpu_to_le16(0))

			if (crq.crq.wLength != cpu_to_le16(0))

				ep->state = DATA_STAGE_OUT;

			else

				ep->state = STATUS_STAGE_IN;

drivers/usb/gadget/cdc2.c

+4 −4
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ static struct usb_device_descriptor device_desc = { 
	.bLength =		sizeof device_desc,

	.bDescriptorType =	USB_DT_DEVICE,



	.bcdUSB =		__constant_cpu_to_le16(0x0200),

	.bcdUSB =		cpu_to_le16(0x0200),



	.bDeviceClass =		USB_CLASS_COMM,

	.bDeviceSubClass =	0,
@@ -74,8 +74,8 @@ static struct usb_device_descriptor device_desc = { 
	/* .bMaxPacketSize0 = f(hardware) */



	/* Vendor and product id can be overridden by module parameters.  */

	.idVendor =		__constant_cpu_to_le16(CDC_VENDOR_NUM),

	.idProduct =		__constant_cpu_to_le16(CDC_PRODUCT_NUM),

	.idVendor =		cpu_to_le16(CDC_VENDOR_NUM),

	.idProduct =		cpu_to_le16(CDC_PRODUCT_NUM),

	/* .bcdDevice = f(hardware) */

	/* .iManufacturer = DYNAMIC */

	/* .iProduct = DYNAMIC */
@@ -193,7 +193,7 @@ static int __init cdc_bind(struct usb_composite_dev *cdev) 
				gadget->name,

				cdc_config_driver.label);

		device_desc.bcdDevice =

			__constant_cpu_to_le16(0x0300 | 0x0099);

			cpu_to_le16(0x0300 | 0x0099);

	}