USB: replace uses of __constant_{endian}

The base versions handle constant folding now.

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

24 files changed, 113 insertions, 113 deletions

diff --git a/drivers/usb/gadget/amd5536udc.c b/drivers/usb/gadget/amd5536udc.c
index abf8192f89e8..826f3adde5d8 100644
--- a/drivers/usb/gadget/amd5536udc.c
+++ b/drivers/usb/gadget/amd5536udc.c
@@ -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;
diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c
index 65b03e3445a1..c22fab164113 100644
--- a/drivers/usb/gadget/atmel_usba_udc.c
+++ b/drivers/usb/gadget/atmel_usba_udc.c
@@ -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 @@ restart:
                          */
                         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;
diff --git a/drivers/usb/gadget/cdc2.c b/drivers/usb/gadget/cdc2.c
index 5495b171cf29..928137d3dbdc 100644
--- a/drivers/usb/gadget/cdc2.c
+++ b/drivers/usb/gadget/cdc2.c
@@ -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);
         }
 
 
diff --git a/drivers/usb/gadget/dummy_hcd.c b/drivers/usb/gadget/dummy_hcd.c
index 9064696636ac..3b42888b72f8 100644
--- a/drivers/usb/gadget/dummy_hcd.c
+++ b/drivers/usb/gadget/dummy_hcd.c
@@ -1626,7 +1626,7 @@ static int dummy_hub_control (
                 hub_descriptor ((struct usb_hub_descriptor *) buf);
                 break;
         case GetHubStatus:
-                *(__le32 *) buf = __constant_cpu_to_le32 (0);
+                *(__le32 *) buf = cpu_to_le32 (0);
                 break;
         case GetPortStatus:
                 if (wIndex != 1)
diff --git a/drivers/usb/gadget/epautoconf.c b/drivers/usb/gadget/epautoconf.c
index a36b1175b18d..cd0914ec898e 100644
--- a/drivers/usb/gadget/epautoconf.c
+++ b/drivers/usb/gadget/epautoconf.c
@@ -148,7 +148,7 @@ ep_matches (
                         return 0;
 
                 /* BOTH:  "high bandwidth" works only at high speed */
-                if ((desc->wMaxPacketSize & __constant_cpu_to_le16(3<<11))) {
+                if ((desc->wMaxPacketSize & cpu_to_le16(3<<11))) {
                         if (!gadget->is_dualspeed)
                                 return 0;
                         /* configure your hardware with enough buffering!! */
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index 37252d0012a7..d006dc652e02 100644
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -156,7 +156,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,
@@ -167,8 +167,8 @@ static struct usb_device_descriptor device_desc = {
          * we support.  (As does bNumConfigurations.)  These values can
          * also 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 */
@@ -318,7 +318,7 @@ static int __init eth_bind(struct usb_composite_dev *cdev)
                                 gadget->name,
                                 eth_config_driver.label);
                 device_desc.bcdDevice =
-                        __constant_cpu_to_le16(0x0300 | 0x0099);
+                        cpu_to_le16(0x0300 | 0x0099);
         }
 
 
diff --git a/drivers/usb/gadget/f_acm.c b/drivers/usb/gadget/f_acm.c
index c1d34df0b157..7953948bfe4a 100644
--- a/drivers/usb/gadget/f_acm.c
+++ b/drivers/usb/gadget/f_acm.c
@@ -125,7 +125,7 @@ static struct usb_cdc_header_desc acm_header_desc __initdata = {
         .bLength =              sizeof(acm_header_desc),
         .bDescriptorType =      USB_DT_CS_INTERFACE,
         .bDescriptorSubType =   USB_CDC_HEADER_TYPE,
-        .bcdCDC =               __constant_cpu_to_le16(0x0110),
+        .bcdCDC =               cpu_to_le16(0x0110),
 };
 
 static struct usb_cdc_call_mgmt_descriptor
@@ -159,7 +159,7 @@ static struct usb_endpoint_descriptor acm_fs_notify_desc __initdata = {
         .bDescriptorType =      USB_DT_ENDPOINT,
         .bEndpointAddress =     USB_DIR_IN,
         .bmAttributes =         USB_ENDPOINT_XFER_INT,
-        .wMaxPacketSize =       __constant_cpu_to_le16(GS_NOTIFY_MAXPACKET),
+        .wMaxPacketSize =       cpu_to_le16(GS_NOTIFY_MAXPACKET),
         .bInterval =            1 << GS_LOG2_NOTIFY_INTERVAL,
 };
 
@@ -197,7 +197,7 @@ static struct usb_endpoint_descriptor acm_hs_notify_desc __initdata = {
         .bDescriptorType =      USB_DT_ENDPOINT,
         .bEndpointAddress =     USB_DIR_IN,
         .bmAttributes =         USB_ENDPOINT_XFER_INT,
-        .wMaxPacketSize =       __constant_cpu_to_le16(GS_NOTIFY_MAXPACKET),
+        .wMaxPacketSize =       cpu_to_le16(GS_NOTIFY_MAXPACKET),
         .bInterval =            GS_LOG2_NOTIFY_INTERVAL+4,
 };
 
@@ -205,14 +205,14 @@ static struct usb_endpoint_descriptor acm_hs_in_desc __initdata = {
         .bLength =              USB_DT_ENDPOINT_SIZE,
         .bDescriptorType =      USB_DT_ENDPOINT,
         .bmAttributes =         USB_ENDPOINT_XFER_BULK,
-        .wMaxPacketSize =       __constant_cpu_to_le16(512),
+        .wMaxPacketSize =       cpu_to_le16(512),
 };
 
 static struct usb_endpoint_descriptor acm_hs_out_desc __initdata = {
         .bLength =              USB_DT_ENDPOINT_SIZE,
         .bDescriptorType =      USB_DT_ENDPOINT,
         .bmAttributes =         USB_ENDPOINT_XFER_BULK,
-        .wMaxPacketSize =       __constant_cpu_to_le16(512),
+        .wMaxPacketSize =       cpu_to_le16(512),
 };
 
 static struct usb_descriptor_header *acm_hs_function[] __initdata = {
diff --git a/drivers/usb/gadget/f_ecm.c b/drivers/usb/gadget/f_ecm.c
index 4ae579948e54..ecf5bdd0ae06 100644
--- a/drivers/usb/gadget/f_ecm.c
+++ b/drivers/usb/gadget/f_ecm.c
@@ -130,7 +130,7 @@ static struct usb_cdc_header_desc ecm_header_desc __initdata = {
         .bDescriptorType =      USB_DT_CS_INTERFACE,
         .bDescriptorSubType =   USB_CDC_HEADER_TYPE,
 
-        .bcdCDC =               __constant_cpu_to_le16(0x0110),
+        .bcdCDC =               cpu_to_le16(0x0110),
 };
 
 static struct usb_cdc_union_desc ecm_union_desc __initdata = {
@@ -148,9 +148,9 @@ static struct usb_cdc_ether_desc ecm_desc __initdata = {
 
         /* this descriptor actually adds value, surprise! */
         /* .iMACAddress = DYNAMIC */
-        .bmEthernetStatistics = __constant_cpu_to_le32(0), /* no statistics */
-        .wMaxSegmentSize =      __constant_cpu_to_le16(ETH_FRAME_LEN),
-        .wNumberMCFilters =     __constant_cpu_to_le16(0),
+        .bmEthernetStatistics = cpu_to_le32(0), /* no statistics */
+        .wMaxSegmentSize =      cpu_to_le16(ETH_FRAME_LEN),
+        .wNumberMCFilters =     cpu_to_le16(0),
         .bNumberPowerFilters =  0,
 };
 
@@ -192,7 +192,7 @@ static struct usb_endpoint_descriptor fs_ecm_notify_desc __initdata = {
 
         .bEndpointAddress =     USB_DIR_IN,
         .bmAttributes =         USB_ENDPOINT_XFER_INT,
-        .wMaxPacketSize =       __constant_cpu_to_le16(ECM_STATUS_BYTECOUNT),
+        .wMaxPacketSize =       cpu_to_le16(ECM_STATUS_BYTECOUNT),
         .bInterval =            1 << LOG2_STATUS_INTERVAL_MSEC,
 };
 
@@ -236,7 +236,7 @@ static struct usb_endpoint_descriptor hs_ecm_notify_desc __initdata = {
 
         .bEndpointAddress =     USB_DIR_IN,
         .bmAttributes =         USB_ENDPOINT_XFER_INT,
-        .wMaxPacketSize =       __constant_cpu_to_le16(ECM_STATUS_BYTECOUNT),
+        .wMaxPacketSize =       cpu_to_le16(ECM_STATUS_BYTECOUNT),
         .bInterval =            LOG2_STATUS_INTERVAL_MSEC + 4,
 };
 static struct usb_endpoint_descriptor hs_ecm_in_desc __initdata = {
@@ -245,7 +245,7 @@ static struct usb_endpoint_descriptor hs_ecm_in_desc __initdata = {
 
         .bEndpointAddress =     USB_DIR_IN,
         .bmAttributes =         USB_ENDPOINT_XFER_BULK,
-        .wMaxPacketSize =       __constant_cpu_to_le16(512),
+        .wMaxPacketSize =       cpu_to_le16(512),
 };
 
 static struct usb_endpoint_descriptor hs_ecm_out_desc __initdata = {
@@ -254,7 +254,7 @@ static struct usb_endpoint_descriptor hs_ecm_out_desc __initdata = {
 
         .bEndpointAddress =     USB_DIR_OUT,
         .bmAttributes =         USB_ENDPOINT_XFER_BULK,
-        .wMaxPacketSize =       __constant_cpu_to_le16(512),
+        .wMaxPacketSize =       cpu_to_le16(512),
 };
 
 static struct usb_descriptor_header *ecm_hs_function[] __initdata = {
diff --git a/drivers/usb/gadget/f_loopback.c b/drivers/usb/gadget/f_loopback.c
index 8affe1dfc2c1..83301bdcdd1a 100644
--- a/drivers/usb/gadget/f_loopback.c
+++ b/drivers/usb/gadget/f_loopback.c
@@ -100,7 +100,7 @@ static struct usb_endpoint_descriptor hs_loop_source_desc = {
         .bDescriptorType =      USB_DT_ENDPOINT,
 
         .bmAttributes =         USB_ENDPOINT_XFER_BULK,
-        .wMaxPacketSize =       __constant_cpu_to_le16(512),
+        .wMaxPacketSize =       cpu_to_le16(512),
 };
 
 static struct usb_endpoint_descriptor hs_loop_sink_desc = {
@@ -108,7 +108,7 @@ static struct usb_endpoint_descriptor hs_loop_sink_desc = {
         .bDescriptorType =      USB_DT_ENDPOINT,
 
         .bmAttributes =         USB_ENDPOINT_XFER_BULK,
-        .wMaxPacketSize =       __constant_cpu_to_le16(512),
+        .wMaxPacketSize =       cpu_to_le16(512),
 };
 
 static struct usb_descriptor_header *hs_loopback_descs[] = {
diff --git a/drivers/usb/gadget/f_obex.c b/drivers/usb/gadget/f_obex.c
index 38aa896cc5db..46d6266f30ec 100644
--- a/drivers/usb/gadget/f_obex.c
+++ b/drivers/usb/gadget/f_obex.c
@@ -123,7 +123,7 @@ static struct usb_cdc_header_desc obex_cdc_header_desc __initdata = {
         .bLength                = sizeof(obex_cdc_header_desc),
         .bDescriptorType        = USB_DT_CS_INTERFACE,
         .bDescriptorSubType     = USB_CDC_HEADER_TYPE,
-        .bcdCDC                 = __constant_cpu_to_le16(0x0120),
+        .bcdCDC                 = cpu_to_le16(0x0120),
 };
 
 static struct usb_cdc_union_desc obex_cdc_union_desc __initdata = {
@@ -138,7 +138,7 @@ static struct usb_cdc_obex_desc obex_desc __initdata = {
         .bLength                = sizeof(obex_desc),
         .bDescriptorType        = USB_DT_CS_INTERFACE,
         .bDescriptorSubType     = USB_CDC_OBEX_TYPE,
-        .bcdVersion             = __constant_cpu_to_le16(0x0100),
+        .bcdVersion             = cpu_to_le16(0x0100),
 };
 
 /* High-Speed Support */
@@ -149,7 +149,7 @@ static struct usb_endpoint_descriptor obex_hs_ep_out_desc __initdata = {
 
         .bEndpointAddress       = USB_DIR_OUT,
         .bmAttributes           = USB_ENDPOINT_XFER_BULK,
-        .wMaxPacketSize         = __constant_cpu_to_le16(512),
+        .wMaxPacketSize         = cpu_to_le16(512),
 };
 
 static struct usb_endpoint_descriptor obex_hs_ep_in_desc __initdata = {
@@ -158,7 +158,7 @@ static struct usb_endpoint_descriptor obex_hs_ep_in_desc __initdata = {
 
         .bEndpointAddress       = USB_DIR_IN,
         .bmAttributes           = USB_ENDPOINT_XFER_BULK,
-        .wMaxPacketSize         = __constant_cpu_to_le16(512),
+        .wMaxPacketSize         = cpu_to_le16(512),
 };
 
 static struct usb_descriptor_header *hs_function[] __initdata = {
diff --git a/drivers/usb/gadget/f_phonet.c b/drivers/usb/gadget/f_phonet.c
index c0916c7b217e..c1abeb89b413 100644
--- a/drivers/usb/gadget/f_phonet.c
+++ b/drivers/usb/gadget/f_phonet.c
@@ -79,7 +79,7 @@ pn_header_desc = {
         .bLength =              sizeof pn_header_desc,
         .bDescriptorType =      USB_DT_CS_INTERFACE,
         .bDescriptorSubType =   USB_CDC_HEADER_TYPE,
-        .bcdCDC =               __constant_cpu_to_le16(0x0110),
+        .bcdCDC =               cpu_to_le16(0x0110),
 };
 
 static const struct usb_cdc_header_desc
@@ -87,7 +87,7 @@ pn_phonet_desc = {
         .bLength =              sizeof pn_phonet_desc,
         .bDescriptorType =      USB_DT_CS_INTERFACE,
         .bDescriptorSubType =   USB_CDC_PHONET_TYPE,
-        .bcdCDC =               __constant_cpu_to_le16(0x1505), /* ??? */
+        .bcdCDC =               cpu_to_le16(0x1505), /* ??? */
 };
 
 static struct usb_cdc_union_desc
@@ -138,7 +138,7 @@ pn_hs_sink_desc = {
 
         .bEndpointAddress =     USB_DIR_OUT,
         .bmAttributes =         USB_ENDPOINT_XFER_BULK,
-        .wMaxPacketSize =       __constant_cpu_to_le16(512),
+        .wMaxPacketSize =       cpu_to_le16(512),
 };
 
 static struct usb_endpoint_descriptor
@@ -157,7 +157,7 @@ pn_hs_source_desc = {
 
         .bEndpointAddress =     USB_DIR_IN,
         .bmAttributes =         USB_ENDPOINT_XFER_BULK,
-        .wMaxPacketSize =       __constant_cpu_to_le16(512),
+        .wMaxPacketSize =       cpu_to_le16(512),
 };
 
 static struct usb_descriptor_header *fs_pn_function[] = {
diff --git a/drivers/usb/gadget/f_rndis.c b/drivers/usb/gadget/f_rndis.c
index fd7b356f902d..3279a4726042 100644
--- a/drivers/usb/gadget/f_rndis.c
+++ b/drivers/usb/gadget/f_rndis.c
@@ -137,7 +137,7 @@ static struct usb_cdc_header_desc header_desc __initdata = {
         .bDescriptorType =      USB_DT_CS_INTERFACE,
         .bDescriptorSubType =   USB_CDC_HEADER_TYPE,
 
-        .bcdCDC =               __constant_cpu_to_le16(0x0110),
+        .bcdCDC =               cpu_to_le16(0x0110),
 };
 
 static struct usb_cdc_call_mgmt_descriptor call_mgmt_descriptor __initdata = {
@@ -187,7 +187,7 @@ static struct usb_endpoint_descriptor fs_notify_desc __initdata = {
 
         .bEndpointAddress =     USB_DIR_IN,
         .bmAttributes =         USB_ENDPOINT_XFER_INT,
-        .wMaxPacketSize =       __constant_cpu_to_le16(STATUS_BYTECOUNT),
+        .wMaxPacketSize =       cpu_to_le16(STATUS_BYTECOUNT),
         .bInterval =            1 << LOG2_STATUS_INTERVAL_MSEC,
 };
 
@@ -230,7 +230,7 @@ static struct usb_endpoint_descriptor hs_notify_desc __initdata = {
 
         .bEndpointAddress =     USB_DIR_IN,
         .bmAttributes =         USB_ENDPOINT_XFER_INT,
-        .wMaxPacketSize =       __constant_cpu_to_le16(STATUS_BYTECOUNT),
+        .wMaxPacketSize =       cpu_to_le16(STATUS_BYTECOUNT),
         .bInterval =            LOG2_STATUS_INTERVAL_MSEC + 4,
 };
 static struct usb_endpoint_descriptor hs_in_desc __initdata = {
@@ -239,7 +239,7 @@ static struct usb_endpoint_descriptor hs_in_desc __initdata = {
 
         .bEndpointAddress =     USB_DIR_IN,
         .bmAttributes =         USB_ENDPOINT_XFER_BULK,
-        .wMaxPacketSize =       __constant_cpu_to_le16(512),
+        .wMaxPacketSize =       cpu_to_le16(512),
 };
 
 static struct usb_endpoint_descriptor hs_out_desc __initdata = {
@@ -248,7 +248,7 @@ static struct usb_endpoint_descriptor hs_out_desc __initdata = {
 
         .bEndpointAddress =     USB_DIR_OUT,
         .bmAttributes =         USB_ENDPOINT_XFER_BULK,
-        .wMaxPacketSize =       __constant_cpu_to_le16(512),
+        .wMaxPacketSize =       cpu_to_le16(512),
 };
 
 static struct usb_descriptor_header *eth_hs_function[] __initdata = {
diff --git a/drivers/usb/gadget/f_serial.c b/drivers/usb/gadget/f_serial.c
index fe5674db344b..db0aa93606ef 100644
--- a/drivers/usb/gadget/f_serial.c
+++ b/drivers/usb/gadget/f_serial.c
@@ -89,14 +89,14 @@ static struct usb_endpoint_descriptor gser_hs_in_desc __initdata = {
         .bLength =              USB_DT_ENDPOINT_SIZE,
         .bDescriptorType =      USB_DT_ENDPOINT,
         .bmAttributes =         USB_ENDPOINT_XFER_BULK,
-        .wMaxPacketSize =       __constant_cpu_to_le16(512),
+        .wMaxPacketSize =       cpu_to_le16(512),
 };
 
 static struct usb_endpoint_descriptor gser_hs_out_desc __initdata = {
         .bLength =              USB_DT_ENDPOINT_SIZE,
         .bDescriptorType =      USB_DT_ENDPOINT,
         .bmAttributes =         USB_ENDPOINT_XFER_BULK,
-        .wMaxPacketSize =       __constant_cpu_to_le16(512),
+        .wMaxPacketSize =       cpu_to_le16(512),
 };
 
 static struct usb_descriptor_header *gser_hs_function[] __initdata = {
diff --git a/drivers/usb/gadget/f_sourcesink.c b/drivers/usb/gadget/f_sourcesink.c
index dc84d26d2835..6aca5c81414a 100644
--- a/drivers/usb/gadget/f_sourcesink.c
+++ b/drivers/usb/gadget/f_sourcesink.c
@@ -118,7 +118,7 @@ static struct usb_endpoint_descriptor hs_source_desc = {
         .bDescriptorType =      USB_DT_ENDPOINT,
 
         .bmAttributes =         USB_ENDPOINT_XFER_BULK,
-        .wMaxPacketSize =       __constant_cpu_to_le16(512),
+        .wMaxPacketSize =       cpu_to_le16(512),
 };
 
 static struct usb_endpoint_descriptor hs_sink_desc = {
@@ -126,7 +126,7 @@ static struct usb_endpoint_descriptor hs_sink_desc = {
         .bDescriptorType =      USB_DT_ENDPOINT,
 
         .bmAttributes =         USB_ENDPOINT_XFER_BULK,
-        .wMaxPacketSize =       __constant_cpu_to_le16(512),
+        .wMaxPacketSize =       cpu_to_le16(512),
 };
 
 static struct usb_descriptor_header *hs_source_sink_descs[] = {
diff --git a/drivers/usb/gadget/f_subset.c b/drivers/usb/gadget/f_subset.c
index fe1832875771..a9c98fdb626d 100644
--- a/drivers/usb/gadget/f_subset.c
+++ b/drivers/usb/gadget/f_subset.c
@@ -108,7 +108,7 @@ static struct usb_cdc_header_desc mdlm_header_desc __initdata = {
         .bDescriptorType =      USB_DT_CS_INTERFACE,
         .bDescriptorSubType =   USB_CDC_HEADER_TYPE,
 
-        .bcdCDC =               __constant_cpu_to_le16(0x0110),
+        .bcdCDC =               cpu_to_le16(0x0110),
 };
 
 static struct usb_cdc_mdlm_desc mdlm_desc __initdata = {
@@ -116,7 +116,7 @@ static struct usb_cdc_mdlm_desc mdlm_desc __initdata = {
         .bDescriptorType =      USB_DT_CS_INTERFACE,
         .bDescriptorSubType =   USB_CDC_MDLM_TYPE,
 
-        .bcdVersion =           __constant_cpu_to_le16(0x0100),
+        .bcdVersion =           cpu_to_le16(0x0100),
         .bGUID = {
                 0x5d, 0x34, 0xcf, 0x66, 0x11, 0x18, 0x11, 0xd6,
                 0xa2, 0x1a, 0x00, 0x01, 0x02, 0xca, 0x9a, 0x7f,
@@ -144,9 +144,9 @@ static struct usb_cdc_ether_desc ether_desc __initdata = {
 
         /* this descriptor actually adds value, surprise! */
         /* .iMACAddress = DYNAMIC */
-        .bmEthernetStatistics = __constant_cpu_to_le32(0), /* no statistics */
-        .wMaxSegmentSize =      __constant_cpu_to_le16(ETH_FRAME_LEN),
-        .wNumberMCFilters =     __constant_cpu_to_le16(0),
+        .bmEthernetStatistics = cpu_to_le32(0), /* no statistics */
+        .wMaxSegmentSize =      cpu_to_le16(ETH_FRAME_LEN),
+        .wNumberMCFilters =     cpu_to_le16(0),
         .bNumberPowerFilters =  0,
 };
 
@@ -186,7 +186,7 @@ static struct usb_endpoint_descriptor hs_subset_in_desc __initdata = {
         .bDescriptorType =      USB_DT_ENDPOINT,
 
         .bmAttributes =         USB_ENDPOINT_XFER_BULK,
-        .wMaxPacketSize =       __constant_cpu_to_le16(512),
+        .wMaxPacketSize =       cpu_to_le16(512),
 };
 
 static struct usb_endpoint_descriptor hs_subset_out_desc __initdata = {
@@ -194,7 +194,7 @@ static struct usb_endpoint_descriptor hs_subset_out_desc __initdata = {
         .bDescriptorType =      USB_DT_ENDPOINT,
 
         .bmAttributes =         USB_ENDPOINT_XFER_BULK,
-        .wMaxPacketSize =       __constant_cpu_to_le16(512),
+        .wMaxPacketSize =       cpu_to_le16(512),
 };
 
 static struct usb_descriptor_header *hs_eth_function[] __initdata = {
diff --git a/drivers/usb/gadget/file_storage.c b/drivers/usb/gadget/file_storage.c
index 1ab9dac7e12d..d3c2464dee82 100644
--- a/drivers/usb/gadget/file_storage.c
+++ b/drivers/usb/gadget/file_storage.c
@@ -847,13 +847,13 @@ device_desc = {
         .bLength =              sizeof device_desc,
         .bDescriptorType =      USB_DT_DEVICE,
 
-        .bcdUSB =               __constant_cpu_to_le16(0x0200),
+        .bcdUSB =               cpu_to_le16(0x0200),
         .bDeviceClass =         USB_CLASS_PER_INTERFACE,
 
         /* The next three values can be overridden by module parameters */
-        .idVendor =             __constant_cpu_to_le16(DRIVER_VENDOR_ID),
-        .idProduct =            __constant_cpu_to_le16(DRIVER_PRODUCT_ID),
-        .bcdDevice =            __constant_cpu_to_le16(0xffff),
+        .idVendor =             cpu_to_le16(DRIVER_VENDOR_ID),
+        .idProduct =            cpu_to_le16(DRIVER_PRODUCT_ID),
+        .bcdDevice =            cpu_to_le16(0xffff),
 
         .iManufacturer =        STRING_MANUFACTURER,
         .iProduct =             STRING_PRODUCT,
@@ -926,7 +926,7 @@ fs_intr_in_desc = {
 
         .bEndpointAddress =     USB_DIR_IN,
         .bmAttributes =         USB_ENDPOINT_XFER_INT,
-        .wMaxPacketSize =       __constant_cpu_to_le16(2),
+        .wMaxPacketSize =       cpu_to_le16(2),
         .bInterval =            32,     // frames -> 32 ms
 };
 
@@ -954,7 +954,7 @@ dev_qualifier = {
         .bLength =              sizeof dev_qualifier,
         .bDescriptorType =      USB_DT_DEVICE_QUALIFIER,
 
-        .bcdUSB =               __constant_cpu_to_le16(0x0200),
+        .bcdUSB =               cpu_to_le16(0x0200),
         .bDeviceClass =         USB_CLASS_PER_INTERFACE,
 
         .bNumConfigurations =   1,
@@ -967,7 +967,7 @@ hs_bulk_in_desc = {
 
         /* bEndpointAddress copied from fs_bulk_in_desc during fsg_bind() */
         .bmAttributes =         USB_ENDPOINT_XFER_BULK,
-        .wMaxPacketSize =       __constant_cpu_to_le16(512),
+        .wMaxPacketSize =       cpu_to_le16(512),
 };
 
 static struct usb_endpoint_descriptor
@@ -977,7 +977,7 @@ hs_bulk_out_desc = {
 
         /* bEndpointAddress copied from fs_bulk_out_desc during fsg_bind() */
         .bmAttributes =         USB_ENDPOINT_XFER_BULK,
-        .wMaxPacketSize =       __constant_cpu_to_le16(512),
+        .wMaxPacketSize =       cpu_to_le16(512),
         .bInterval =            1,      // NAK every 1 uframe
 };
 
@@ -988,7 +988,7 @@ hs_intr_in_desc = {
 
         /* bEndpointAddress copied from fs_intr_in_desc during fsg_bind() */
         .bmAttributes =         USB_ENDPOINT_XFER_INT,
-        .wMaxPacketSize =       __constant_cpu_to_le16(2),
+        .wMaxPacketSize =       cpu_to_le16(2),
         .bInterval =            9,      // 2**(9-1) = 256 uframes -> 32 ms
 };
 
@@ -2646,7 +2646,7 @@ static int send_status(struct fsg_dev *fsg)
                 struct bulk_cs_wrap     *csw = bh->buf;
 
                 /* Store and send the Bulk-only CSW */
-                csw->Signature = __constant_cpu_to_le32(USB_BULK_CS_SIG);
+                csw->Signature = cpu_to_le32(USB_BULK_CS_SIG);
                 csw->Tag = fsg->tag;
                 csw->Residue = cpu_to_le32(fsg->residue);
                 csw->Status = status;
@@ -3089,7 +3089,7 @@ static int received_cbw(struct fsg_dev *fsg, struct fsg_buffhd *bh)
 
         /* Is the CBW valid? */
         if (req->actual != USB_BULK_CB_WRAP_LEN ||
-                        cbw->Signature != __constant_cpu_to_le32(
+                        cbw->Signature != cpu_to_le32(
                                 USB_BULK_CB_SIG)) {
                 DBG(fsg, "invalid CBW: len %u sig 0x%x\n",
                                 req->actual,
diff --git a/drivers/usb/gadget/gmidi.c b/drivers/usb/gadget/gmidi.c
index 60d3f9e9b51f..bb738bc96d4a 100644
--- a/drivers/usb/gadget/gmidi.c
+++ b/drivers/usb/gadget/gmidi.c
@@ -199,10 +199,10 @@ DECLARE_USB_MS_ENDPOINT_DESCRIPTOR(1);
 static struct usb_device_descriptor device_desc = {
         .bLength =              USB_DT_DEVICE_SIZE,
         .bDescriptorType =      USB_DT_DEVICE,
-        .bcdUSB =               __constant_cpu_to_le16(0x0200),
+        .bcdUSB =               cpu_to_le16(0x0200),
         .bDeviceClass =         USB_CLASS_PER_INTERFACE,
-        .idVendor =             __constant_cpu_to_le16(DRIVER_VENDOR_NUM),
-        .idProduct =            __constant_cpu_to_le16(DRIVER_PRODUCT_NUM),
+        .idVendor =             cpu_to_le16(DRIVER_VENDOR_NUM),
+        .idProduct =            cpu_to_le16(DRIVER_PRODUCT_NUM),
         .iManufacturer =        STRING_MANUFACTURER,
         .iProduct =             STRING_PRODUCT,
         .bNumConfigurations =   1,
@@ -241,8 +241,8 @@ static const struct usb_ac_header_descriptor_1 ac_header_desc = {
         .bLength =              USB_DT_AC_HEADER_SIZE(1),
         .bDescriptorType =      USB_DT_CS_INTERFACE,
         .bDescriptorSubtype =   USB_MS_HEADER,
-        .bcdADC =               __constant_cpu_to_le16(0x0100),
-        .wTotalLength =         __constant_cpu_to_le16(USB_DT_AC_HEADER_SIZE(1)),
+        .bcdADC =               cpu_to_le16(0x0100),
+        .wTotalLength =         cpu_to_le16(USB_DT_AC_HEADER_SIZE(1)),
         .bInCollection =        1,
         .baInterfaceNr = {
                 [0] =           GMIDI_MS_INTERFACE,
@@ -265,8 +265,8 @@ static const struct usb_ms_header_descriptor ms_header_desc = {
         .bLength =              USB_DT_MS_HEADER_SIZE,
         .bDescriptorType =      USB_DT_CS_INTERFACE,
         .bDescriptorSubtype =   USB_MS_HEADER,
-        .bcdMSC =               __constant_cpu_to_le16(0x0100),
-        .wTotalLength =         __constant_cpu_to_le16(USB_DT_MS_HEADER_SIZE
+        .bcdMSC =               cpu_to_le16(0x0100),
+        .wTotalLength =         cpu_to_le16(USB_DT_MS_HEADER_SIZE
                                 + 2*USB_DT_MIDI_IN_SIZE
                                 + 2*USB_DT_MIDI_OUT_SIZE(1)),
 };
@@ -1227,7 +1227,7 @@ autoconf_fail:
                  */
                 pr_warning("%s: controller '%s' not recognized\n",
                         shortname, gadget->name);
-                device_desc.bcdDevice = __constant_cpu_to_le16(0x9999);
+                device_desc.bcdDevice = cpu_to_le16(0x9999);
         }
 
 
diff --git a/drivers/usb/gadget/goku_udc.c b/drivers/usb/gadget/goku_udc.c
index 63419c4d503c..de010c939dbb 100644
--- a/drivers/usb/gadget/goku_udc.c
+++ b/drivers/usb/gadget/goku_udc.c
@@ -1472,7 +1472,7 @@ static void ep0_setup(struct goku_udc *dev)
                                 /* active endpoint */
                                 if (tmp > 3 || (!dev->ep[tmp].desc && tmp != 0))
                                         goto stall;
-                                if (ctrl.wIndex & __constant_cpu_to_le16(
+                                if (ctrl.wIndex & cpu_to_le16(
                                                 USB_DIR_IN)) {
                                         if (!dev->ep[tmp].is_in)
                                                 goto stall;
@@ -1480,7 +1480,7 @@ static void ep0_setup(struct goku_udc *dev)
                                         if (dev->ep[tmp].is_in)
                                                 goto stall;
                                 }
-                                if (ctrl.wValue != __constant_cpu_to_le16(
+                                if (ctrl.wValue != cpu_to_le16(
                                                 USB_ENDPOINT_HALT))
                                         goto stall;
                                 if (tmp)
@@ -1493,7 +1493,7 @@ succeed:
                                 return;
                         case USB_RECIP_DEVICE:
                                 /* device remote wakeup: always clear */
-                                if (ctrl.wValue != __constant_cpu_to_le16(1))
+                                if (ctrl.wValue != cpu_to_le16(1))
                                         goto stall;
                                 VDBG(dev, "clear dev remote wakeup\n");
                                 goto succeed;
@@ -1519,7 +1519,7 @@ succeed:
         dev->req_config = (ctrl.bRequest == USB_REQ_SET_CONFIGURATION
                                 && ctrl.bRequestType == USB_RECIP_DEVICE);
         if (unlikely(dev->req_config))
-                dev->configured = (ctrl.wValue != __constant_cpu_to_le16(0));
+                dev->configured = (ctrl.wValue != cpu_to_le16(0));
 
         /* delegate everything to the gadget driver.
          * it may respond after this irq handler returns.
diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c
index 317b48fdbf01..d20937f28a19 100644
--- a/drivers/usb/gadget/inode.c
+++ b/drivers/usb/gadget/inode.c
@@ -1334,7 +1334,7 @@ static void make_qualifier (struct dev_data *dev)
 
         qual.bLength = sizeof qual;
         qual.bDescriptorType = USB_DT_DEVICE_QUALIFIER;
-        qual.bcdUSB = __constant_cpu_to_le16 (0x0200);
+        qual.bcdUSB = cpu_to_le16 (0x0200);
 
         desc = dev->dev;
         qual.bDeviceClass = desc->bDeviceClass;
@@ -1908,7 +1908,7 @@ dev_config (struct file *fd, const char __user *buf, size_t len, loff_t *ptr)
                         || dev->dev->bNumConfigurations != 1)
                 goto fail;
         dev->dev->bNumConfigurations = 1;
-        dev->dev->bcdUSB = __constant_cpu_to_le16 (0x0200);
+        dev->dev->bcdUSB = cpu_to_le16 (0x0200);
 
         /* triggers gadgetfs_bind(); then we can enumerate. */
         spin_unlock_irq (&dev->lock);
diff --git a/drivers/usb/gadget/net2280.c b/drivers/usb/gadget/net2280.c
index 12c6d83b218c..9498be87a724 100644
--- a/drivers/usb/gadget/net2280.c
+++ b/drivers/usb/gadget/net2280.c
@@ -142,8 +142,8 @@ static char *type_string (u8 bmAttributes)
 
 #include "net2280.h"
 
-#define valid_bit       __constant_cpu_to_le32 (1 << VALID_BIT)
-#define dma_done_ie     __constant_cpu_to_le32 (1 << DMA_DONE_INTERRUPT_ENABLE)
+#define valid_bit       cpu_to_le32 (1 << VALID_BIT)
+#define dma_done_ie     cpu_to_le32 (1 << DMA_DONE_INTERRUPT_ENABLE)
 
 /*-------------------------------------------------------------------------*/
 
@@ -425,7 +425,7 @@ net2280_alloc_request (struct usb_ep *_ep, gfp_t gfp_flags)
                         return NULL;
                 }
                 td->dmacount = 0;       /* not VALID */
-                td->dmaaddr = __constant_cpu_to_le32 (DMA_ADDR_INVALID);
+                td->dmaaddr = cpu_to_le32 (DMA_ADDR_INVALID);
                 td->dmadesc = td->dmaaddr;
                 req->td = td;
         }
@@ -775,7 +775,7 @@ static void start_dma (struct net2280_ep *ep, struct net2280_request *req)
         fill_dma_desc (ep, req, 1);
 
         if (!use_dma_chaining)
-                req->td->dmacount |= __constant_cpu_to_le32 (1 << END_OF_CHAIN);
+                req->td->dmacount |= cpu_to_le32 (1 << END_OF_CHAIN);
 
         start_queue (ep, tmp, req->td_dma);
 }
@@ -2407,9 +2407,9 @@ static void handle_stat0_irqs (struct net2280 *dev, u32 stat)
 
                         if (readl (&e->regs->ep_rsp)
                                         & (1 << SET_ENDPOINT_HALT))
-                                status = __constant_cpu_to_le32 (1);
+                                status = cpu_to_le32 (1);
                         else
-                                status = __constant_cpu_to_le32 (0);
+                                status = cpu_to_le32 (0);
 
                         /* don't bother with a request object! */
                         writel (0, &dev->epregs [0].ep_irqenb);
@@ -2667,7 +2667,7 @@ static void handle_stat1_irqs (struct net2280 *dev, u32 stat)
                                 req = list_entry (ep->queue.next,
                                                 struct net2280_request, queue);
                                 dmacount = req->td->dmacount;
-                                dmacount &= __constant_cpu_to_le32 (
+                                dmacount &= cpu_to_le32 (
                                                 (1 << VALID_BIT)
                                                 | DMA_BYTE_COUNT_MASK);
                                 if (dmacount && (dmacount & valid_bit) == 0)
@@ -2881,7 +2881,7 @@ static int net2280_probe (struct pci_dev *pdev, const struct pci_device_id *id)
                         goto done;
                 }
                 td->dmacount = 0;       /* not VALID */
-                td->dmaaddr = __constant_cpu_to_le32 (DMA_ADDR_INVALID);
+                td->dmaaddr = cpu_to_le32 (DMA_ADDR_INVALID);
                 td->dmadesc = td->dmaaddr;
                 dev->ep [i].dummy = td;
         }
diff --git a/drivers/usb/gadget/printer.c b/drivers/usb/gadget/printer.c
index 5a3034fdfe47..29500154d00c 100644
--- a/drivers/usb/gadget/printer.c
+++ b/drivers/usb/gadget/printer.c
@@ -225,12 +225,12 @@ module_param(qlen, uint, S_IRUGO|S_IWUSR);
 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_PER_INTERFACE,
         .bDeviceSubClass =      0,
         .bDeviceProtocol =      0,
-        .idVendor =             __constant_cpu_to_le16(PRINTER_VENDOR_NUM),
-        .idProduct =            __constant_cpu_to_le16(PRINTER_PRODUCT_NUM),
+        .idVendor =             cpu_to_le16(PRINTER_VENDOR_NUM),
+        .idProduct =            cpu_to_le16(PRINTER_PRODUCT_NUM),
         .iManufacturer =        STRING_MANUFACTURER,
         .iProduct =             STRING_PRODUCT,
         .iSerialNumber =        STRING_SERIALNUM,
@@ -299,20 +299,20 @@ static struct usb_endpoint_descriptor hs_ep_in_desc = {
         .bLength =              USB_DT_ENDPOINT_SIZE,
         .bDescriptorType =      USB_DT_ENDPOINT,
         .bmAttributes =         USB_ENDPOINT_XFER_BULK,
-        .wMaxPacketSize =       __constant_cpu_to_le16(512)
+        .wMaxPacketSize =       cpu_to_le16(512)
 };
 
 static struct usb_endpoint_descriptor hs_ep_out_desc = {
         .bLength =              USB_DT_ENDPOINT_SIZE,
         .bDescriptorType =      USB_DT_ENDPOINT,
         .bmAttributes =         USB_ENDPOINT_XFER_BULK,
-        .wMaxPacketSize =       __constant_cpu_to_le16(512)
+        .wMaxPacketSize =       cpu_to_le16(512)
 };
 
 static struct usb_qualifier_descriptor dev_qualifier = {
         .bLength =              sizeof dev_qualifier,
         .bDescriptorType =      USB_DT_DEVICE_QUALIFIER,
-        .bcdUSB =               __constant_cpu_to_le16(0x0200),
+        .bcdUSB =               cpu_to_le16(0x0200),
         .bDeviceClass =         USB_CLASS_PRINTER,
         .bNumConfigurations =   1
 };
@@ -1406,16 +1406,16 @@ printer_bind(struct usb_gadget *gadget)
                         gadget->name);
                 /* unrecognized, but safe unless bulk is REALLY quirky */
                 device_desc.bcdDevice =
-                        __constant_cpu_to_le16(0xFFFF);
+                        cpu_to_le16(0xFFFF);
         }
         snprintf(manufacturer, sizeof(manufacturer), "%s %s with %s",
                 init_utsname()->sysname, init_utsname()->release,
                 gadget->name);
 
         device_desc.idVendor =
-                __constant_cpu_to_le16(PRINTER_VENDOR_NUM);
+                cpu_to_le16(PRINTER_VENDOR_NUM);
         device_desc.idProduct =
-                __constant_cpu_to_le16(PRINTER_PRODUCT_NUM);
+                cpu_to_le16(PRINTER_PRODUCT_NUM);
 
         /* support optional vendor/distro customization */
         if (idVendor) {
diff --git a/drivers/usb/gadget/serial.c b/drivers/usb/gadget/serial.c
index 37879af1c433..f46a60962dab 100644
--- a/drivers/usb/gadget/serial.c
+++ b/drivers/usb/gadget/serial.c
@@ -87,12 +87,12 @@ static struct usb_gadget_strings *dev_strings[] = {
 static struct usb_device_descriptor device_desc = {
         .bLength =              USB_DT_DEVICE_SIZE,
         .bDescriptorType =      USB_DT_DEVICE,
-        .bcdUSB =               __constant_cpu_to_le16(0x0200),
+        .bcdUSB =               cpu_to_le16(0x0200),
         /* .bDeviceClass = f(use_acm) */
         .bDeviceSubClass =      0,
         .bDeviceProtocol =      0,
         /* .bMaxPacketSize0 = f(hardware) */
-        .idVendor =             __constant_cpu_to_le16(GS_VENDOR_ID),
+        .idVendor =             cpu_to_le16(GS_VENDOR_ID),
         /* .idProduct = f(use_acm) */
         /* .bcdDevice = f(hardware) */
         /* .iManufacturer = DYNAMIC */
@@ -216,7 +216,7 @@ static int __init gs_bind(struct usb_composite_dev *cdev)
                 pr_warning("gs_bind: controller '%s' not recognized\n",
                         gadget->name);
                 device_desc.bcdDevice =
-                        __constant_cpu_to_le16(GS_VERSION_NUM | 0x0099);
+                        cpu_to_le16(GS_VERSION_NUM | 0x0099);
         }
 
         if (gadget_is_otg(cdev->gadget)) {
@@ -255,19 +255,19 @@ static int __init init(void)
                 serial_config_driver.bConfigurationValue = 2;
                 device_desc.bDeviceClass = USB_CLASS_COMM;
                 device_desc.idProduct =
-                                __constant_cpu_to_le16(GS_CDC_PRODUCT_ID);
+                                cpu_to_le16(GS_CDC_PRODUCT_ID);
         } else if (use_obex) {
                 serial_config_driver.label = "CDC OBEX config";
                 serial_config_driver.bConfigurationValue = 3;
                 device_desc.bDeviceClass = USB_CLASS_COMM;
                 device_desc.idProduct =
-                        __constant_cpu_to_le16(GS_CDC_OBEX_PRODUCT_ID);
+                        cpu_to_le16(GS_CDC_OBEX_PRODUCT_ID);
         } else {
                 serial_config_driver.label = "Generic Serial config";
                 serial_config_driver.bConfigurationValue = 1;
                 device_desc.bDeviceClass = USB_CLASS_VENDOR_SPEC;
                 device_desc.idProduct =
-                                __constant_cpu_to_le16(GS_PRODUCT_ID);
+                                cpu_to_le16(GS_PRODUCT_ID);
         }
         strings_dev[STRING_DESCRIPTION_IDX].s = serial_config_driver.label;
 
diff --git a/drivers/usb/gadget/u_serial.c b/drivers/usb/gadget/u_serial.c
index 53d59287f2bc..0a4d99ab40d8 100644
--- a/drivers/usb/gadget/u_serial.c
+++ b/drivers/usb/gadget/u_serial.c
@@ -1092,7 +1092,7 @@ int __init gserial_setup(struct usb_gadget *g, unsigned count)
         gs_tty_driver->init_termios.c_ispeed = 9600;
         gs_tty_driver->init_termios.c_ospeed = 9600;
 
-        coding.dwDTERate = __constant_cpu_to_le32(9600);
+        coding.dwDTERate = cpu_to_le32(9600);
         coding.bCharFormat = 8;
         coding.bParityType = USB_CDC_NO_PARITY;
         coding.bDataBits = USB_CDC_1_STOP_BITS;
diff --git a/drivers/usb/gadget/zero.c b/drivers/usb/gadget/zero.c
index 361d9659ac48..20614dce8db9 100644
--- a/drivers/usb/gadget/zero.c
+++ b/drivers/usb/gadget/zero.c
@@ -113,11 +113,11 @@ 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_VENDOR_SPEC,
 
-        .idVendor =             __constant_cpu_to_le16(DRIVER_VENDOR_NUM),
-        .idProduct =            __constant_cpu_to_le16(DRIVER_PRODUCT_NUM),
+        .idVendor =             cpu_to_le16(DRIVER_VENDOR_NUM),
+        .idProduct =            cpu_to_le16(DRIVER_PRODUCT_NUM),
         .bNumConfigurations =   2,
 };
 
@@ -265,7 +265,7 @@ static int __init zero_bind(struct usb_composite_dev *cdev)
                  */
                 pr_warning("%s: controller '%s' not recognized\n",
                         longname, gadget->name);
-                device_desc.bcdDevice = __constant_cpu_to_le16(0x9999);
+                device_desc.bcdDevice = cpu_to_le16(0x9999);
         }