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>

1 files changed, 4 insertions, 4 deletions

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);
         }