Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into avr32-arch

1 files changed, 10 insertions, 10 deletions

diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c
index ee7ebb674416..563d57275448 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;