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>
This commit is contained in:

committed by
Greg Kroah-Hartman

parent
a78b42824d
commit
551509d267
@@ -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,
|
||||
|
Reference in New Issue
Block a user