checkpatch.pl prefers us to use __packed instead
of the more lengthy __attribute__ ((packed)), so
a simple search and replace fixed all occurrences
on all USB headers.
This patch was conceived with the following:
$ for i in $(git grep -e "__attribute__.((packed))" \
include/linux/usb/ | cut -d: -f1 | uniq); \
do sed -i 's/__attribute__ ((packed))/__packed/g' \
$i; done
It fixes checkpatch.pl warnings such as:
WARNING: __packed is preferred over __attribute__((packed))
#838: FILE: linux/usb/ch9.h:838:
+} __attribute__((packed));
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
---
include/linux/usb/audio.h | 24 ++++++++++++------------
include/linux/usb/cdc.h | 38 +++++++++++++++++++-------------------
include/linux/usb/ch11.h | 8 ++++----
include/linux/usb/ch9.h | 22 +++++++++++-----------
include/linux/usb/ehci_def.h | 6 +++---
include/linux/usb/irda.h | 2 +-
include/linux/usb/langwell_udc.h | 4 ++--
include/linux/usb/midi.h | 14 +++++++-------
include/linux/usb/musb.h | 4 ++--
include/linux/usb/net2280.h | 12 ++++++------
include/linux/usb/rndis_host.h | 28 ++++++++++++++--------------
include/linux/usb/video.h | 14 +++++++-------
include/linux/usb/wusb-wa.h | 2 +-
13 files changed, 89 insertions(+), 89 deletions(-)
diff --git a/include/linux/usb/audio.h b/include/linux/usb/audio.h
index a54b825..5ab6a3f 100644
--- a/include/linux/usb/audio.h
+++ b/include/linux/usb/audio.h
@@ -159,7 +159,7 @@ struct uac1_ac_header_descriptor {
__le16 wTotalLength; /* includes Unit and Terminal desc. */
__u8 bInCollection; /* n */
__u8 baInterfaceNr[]; /* [n] */
-} __attribute__ ((packed));
+} __packed;
#define UAC_DT_AC_HEADER_SIZE(n) (8 + (n))
@@ -173,7 +173,7 @@ struct uac1_ac_header_descriptor_##n { \
__le16 wTotalLength; \
__u8 bInCollection; \
__u8 baInterfaceNr[n]; \
-} __attribute__ ((packed))
+} __packed
/* 4.3.2.1 Input Terminal Descriptor */
struct uac_input_terminal_descriptor {
@@ -187,7 +187,7 @@ struct uac_input_terminal_descriptor {
__le16 wChannelConfig;
__u8 iChannelNames;
__u8 iTerminal;
-} __attribute__ ((packed));
+} __packed;
#define UAC_DT_INPUT_TERMINAL_SIZE 12
@@ -214,7 +214,7 @@ struct uac1_output_terminal_descriptor {
__u8 bAssocTerminal; /* ID of the Input Terminal associated */
__u8 bSourceID; /* ID of the connected Unit or Terminal*/
__u8 iTerminal;
-} __attribute__ ((packed));
+} __packed;
#define UAC_DT_OUTPUT_TERMINAL_SIZE 9
@@ -242,7 +242,7 @@ struct uac_feature_unit_descriptor_##ch { \
__u8 bControlSize; \
__le16 bmaControls[ch + 1]; \
__u8 iFeature; \
-} __attribute__ ((packed))
+} __packed
/* 4.3.2.3 Mixer Unit Descriptor */
struct uac_mixer_unit_descriptor {
@@ -252,7 +252,7 @@ struct uac_mixer_unit_descriptor {
__u8 bUnitID;
__u8 bNrInPins;
__u8 baSourceID[];
-} __attribute__ ((packed));
+} __packed;
static inline __u8 uac_mixer_unit_bNrChannels(struct uac_mixer_unit_descriptor *desc)
{
@@ -302,7 +302,7 @@ struct uac_selector_unit_descriptor {
__u8 bUintID;
__u8 bNrInPins;
__u8 baSourceID[];
-} __attribute__ ((packed));
+} __packed;
static inline __u8 uac_selector_unit_iSelector(struct uac_selector_unit_descriptor *desc)
{
@@ -336,7 +336,7 @@ struct uac_processing_unit_descriptor {
__u16 wProcessType;
__u8 bNrInPins;
__u8 baSourceID[];
-} __attribute__ ((packed));
+} __packed;
static inline __u8 uac_processing_unit_bNrChannels(struct uac_processing_unit_descriptor *desc)
{
@@ -402,7 +402,7 @@ struct uac1_as_header_descriptor {
__u8 bTerminalLink; /* Terminal ID of connected Terminal */
__u8 bDelay; /* Delay introduced by the data path */
__le16 wFormatTag; /* The Audio Data Format */
-} __attribute__ ((packed));
+} __packed;
#define UAC_DT_AS_HEADER_SIZE 7
@@ -425,7 +425,7 @@ struct uac_format_type_i_continuous_descriptor {
__u8 bSamFreqType;
__u8 tLowerSamFreq[3];
__u8 tUpperSamFreq[3];
-} __attribute__ ((packed));
+} __packed;
#define UAC_FORMAT_TYPE_I_CONTINUOUS_DESC_SIZE 14
@@ -439,7 +439,7 @@ struct uac_format_type_i_discrete_descriptor {
__u8 bBitResolution;
__u8 bSamFreqType;
__u8 tSamFreq[][3];
-} __attribute__ ((packed));
+} __packed;
#define DECLARE_UAC_FORMAT_TYPE_I_DISCRETE_DESC(n) \
struct uac_format_type_i_discrete_descriptor_##n { \
@@ -452,7 +452,7 @@ struct uac_format_type_i_discrete_descriptor_##n { \
__u8 bBitResolution; \
__u8 bSamFreqType; \
__u8 tSamFreq[n][3]; \
-} __attribute__ ((packed))
+} __packed
#define UAC_FORMAT_TYPE_I_DISCRETE_DESC_SIZE(n) (8 + (n * 3))
diff --git a/include/linux/usb/cdc.h b/include/linux/usb/cdc.h
index 5e86dc7..06a847c 100644
--- a/include/linux/usb/cdc.h
+++ b/include/linux/usb/cdc.h
@@ -61,7 +61,7 @@ struct usb_cdc_header_desc {
__u8 bDescriptorSubType;
__le16 bcdCDC;
-} __attribute__ ((packed));
+} __packed;
/* "Call Management Descriptor" from CDC spec 5.2.3.2 */
struct usb_cdc_call_mgmt_descriptor {
@@ -74,7 +74,7 @@ struct usb_cdc_call_mgmt_descriptor {
#define USB_CDC_CALL_MGMT_CAP_DATA_INTF 0x02
__u8 bDataInterface;
-} __attribute__ ((packed));
+} __packed;
/* "Abstract Control Management Descriptor" from CDC spec 5.2.3.3 */
struct usb_cdc_acm_descriptor {
@@ -83,7 +83,7 @@ struct usb_cdc_acm_descriptor {
__u8 bDescriptorSubType;
__u8 bmCapabilities;
-} __attribute__ ((packed));
+} __packed;
/* capabilities from 5.2.3.3 */
@@ -101,7 +101,7 @@ struct usb_cdc_union_desc {
__u8 bMasterInterface0;
__u8 bSlaveInterface0;
/* ... and there could be other slave interfaces */
-} __attribute__ ((packed));
+} __packed;
/* "Country Selection Functional Descriptor" from CDC spec 5.2.3.9 */
struct usb_cdc_country_functional_desc {
@@ -112,7 +112,7 @@ struct usb_cdc_country_functional_desc {
__u8 iCountryCodeRelDate;
__le16 wCountyCode0;
/* ... and there can be a lot of country codes */
-} __attribute__ ((packed));
+} __packed;
/* "Network Channel Terminal Functional Descriptor" from CDC spec 5.2.3.11 */
struct usb_cdc_network_terminal_desc {
@@ -124,7 +124,7 @@ struct usb_cdc_network_terminal_desc {
__u8 iName;
__u8 bChannelIndex;
__u8 bPhysicalInterface;
-} __attribute__ ((packed));
+} __packed;
/* "Ethernet Networking Functional Descriptor" from CDC spec 5.2.3.16 */
struct usb_cdc_ether_desc {
@@ -137,7 +137,7 @@ struct usb_cdc_ether_desc {
__le16 wMaxSegmentSize;
__le16 wNumberMCFilters;
__u8 bNumberPowerFilters;
-} __attribute__ ((packed));
+} __packed;
/* "Telephone Control Model Functional Descriptor" from CDC WMC spec 6.3..3 */
struct usb_cdc_dmm_desc {
@@ -146,7 +146,7 @@ struct usb_cdc_dmm_desc {
__u8 bDescriptorSubtype;
__u16 bcdVersion;
__le16 wMaxCommand;
-} __attribute__ ((packed));
+} __packed;
/* "MDLM Functional Descriptor" from CDC WMC spec 6.7.2.3 */
struct usb_cdc_mdlm_desc {
@@ -156,7 +156,7 @@ struct usb_cdc_mdlm_desc {
__le16 bcdVersion;
__u8 bGUID[16];
-} __attribute__ ((packed));
+} __packed;
/* "MDLM Detail Functional Descriptor" from CDC WMC spec 6.7.2.4 */
struct usb_cdc_mdlm_detail_desc {
@@ -167,7 +167,7 @@ struct usb_cdc_mdlm_detail_desc {
/* type is associated with mdlm_desc.bGUID */
__u8 bGuidDescriptorType;
__u8 bDetailData[0];
-} __attribute__ ((packed));
+} __packed;
/* "OBEX Control Model Functional Descriptor" */
struct usb_cdc_obex_desc {
@@ -176,7 +176,7 @@ struct usb_cdc_obex_desc {
__u8 bDescriptorSubType;
__le16 bcdVersion;
-} __attribute__ ((packed));
+} __packed;
/* "NCM Control Model Functional Descriptor" */
struct usb_cdc_ncm_desc {
@@ -186,7 +186,7 @@ struct usb_cdc_ncm_desc {
__le16 bcdNcmVersion;
__u8 bmNetworkCapabilities;
-} __attribute__ ((packed));
+} __packed;
/*-------------------------------------------------------------------------*/
/*
@@ -238,7 +238,7 @@ struct usb_cdc_line_coding {
#define USB_CDC_SPACE_PARITY 4
__u8 bDataBits;
-} __attribute__ ((packed));
+} __packed;
/* table 62; bits in multicast filter */
#define USB_CDC_PACKET_TYPE_PROMISCUOUS (1 << 0)
@@ -269,7 +269,7 @@ struct usb_cdc_notification {
__le16 wValue;
__le16 wIndex;
__le16 wLength;
-} __attribute__ ((packed));
+} __packed;
/*-------------------------------------------------------------------------*/
@@ -293,7 +293,7 @@ struct usb_cdc_ncm_ntb_parameters {
__le16 wNdpOutPayloadRemainder;
__le16 wNdpOutAlignment;
__le16 wPadding2;
-} __attribute__ ((packed));
+} __packed;
/*
* CDC NCM transfer headers, CDC NCM subclass 3.2
@@ -308,7 +308,7 @@ struct usb_cdc_ncm_nth16 {
__le16 wSequence;
__le16 wBlockLength;
__le16 wFpIndex;
-} __attribute__ ((packed));
+} __packed;
struct usb_cdc_ncm_nth32 {
__le32 dwSignature;
@@ -316,7 +316,7 @@ struct usb_cdc_ncm_nth32 {
__le16 wSequence;
__le32 dwBlockLength;
__le32 dwFpIndex;
-} __attribute__ ((packed));
+} __packed;
/*
* CDC NCM datagram pointers, CDC NCM subclass 3.3
@@ -339,7 +339,7 @@ struct usb_cdc_ncm_ndp16 {
__le16 wLength;
__le16 wNextFpIndex;
struct usb_cdc_ncm_dpe16 dpe16[0];
-} __attribute__ ((packed));
+} __packed;
/* 32-bit NCM Datagram Pointer Entry */
struct usb_cdc_ncm_dpe32 {
@@ -355,7 +355,7 @@ struct usb_cdc_ncm_ndp32 {
__le32 dwNextNdpIndex;
__le32 dwReserved12;
struct usb_cdc_ncm_dpe32 dpe32[0];
-} __attribute__ ((packed));
+} __packed;
/* CDC NCM subclass 3.2.1 and 3.2.2 */
#define USB_CDC_NCM_NDP16_INDEX_MIN 0x000C
diff --git a/include/linux/usb/ch11.h b/include/linux/usb/ch11.h
index 10ec069..f1c7a79 100644
--- a/include/linux/usb/ch11.h
+++ b/include/linux/usb/ch11.h
@@ -83,7 +83,7 @@
struct usb_port_status {
__le16 wPortStatus;
__le16 wPortChange;
-} __attribute__ ((packed));
+} __packed;
/*
* wPortStatus bit field
@@ -155,7 +155,7 @@ struct usb_port_status {
struct usb_hub_status {
__le16 wHubStatus;
__le16 wHubChange;
-} __attribute__ ((packed));
+} __packed;
/*
* Hub Status & Hub Change bit masks
@@ -187,7 +187,7 @@ struct usb_hub_descriptor {
/* add 1 bit for hub status change; round to bytes */
__u8 DeviceRemovable[(USB_MAXCHILDREN + 1 + 7) / 8];
__u8 PortPwrCtrlMask[(USB_MAXCHILDREN + 1 + 7) / 8];
-} __attribute__ ((packed));
+} __packed;
/* port indicator status selectors, tables 11-7 and 11-25 */
@@ -203,7 +203,7 @@ enum hub_led_mode {
INDICATOR_GREEN_BLINK, INDICATOR_GREEN_BLINK_OFF,
INDICATOR_AMBER_BLINK, INDICATOR_AMBER_BLINK_OFF,
INDICATOR_ALT_BLINK, INDICATOR_ALT_BLINK_OFF
-} __attribute__ ((packed));
+} __packed;
/* Transaction Translator Think Times, in bits */
#define HUB_TTTT_8_BITS 0x00
diff --git a/include/linux/usb/ch9.h b/include/linux/usb/ch9.h
index ab46194..bce0df5 100644
--- a/include/linux/usb/ch9.h
+++ b/include/linux/usb/ch9.h
@@ -174,7 +174,7 @@ struct usb_ctrlrequest {
__le16 wValue;
__le16 wIndex;
__le16 wLength;
-} __attribute__ ((packed));
+} __packed;
/*-------------------------------------------------------------------------*/
@@ -235,7 +235,7 @@ struct usb_ctrlrequest {
struct usb_descriptor_header {
__u8 bLength;
__u8 bDescriptorType;
-} __attribute__ ((packed));
+} __packed;
/*-------------------------------------------------------------------------*/
@@ -257,7 +257,7 @@ struct usb_device_descriptor {
__u8 iProduct;
__u8 iSerialNumber;
__u8 bNumConfigurations;
-} __attribute__ ((packed));
+} __packed;
#define USB_DT_DEVICE_SIZE 18
@@ -307,7 +307,7 @@ struct usb_config_descriptor {
__u8 iConfiguration;
__u8 bmAttributes;
__u8 bMaxPower;
-} __attribute__ ((packed));
+} __packed;
#define USB_DT_CONFIG_SIZE 9
@@ -325,7 +325,7 @@ struct usb_string_descriptor {
__u8 bDescriptorType;
__le16 wData[1]; /* UTF-16LE encoded */
-} __attribute__ ((packed));
+} __packed;
/* note that "string" zero is special, it holds language codes that
* the device supports, not Unicode characters.
@@ -345,7 +345,7 @@ struct usb_interface_descriptor {
__u8 bInterfaceSubClass;
__u8 bInterfaceProtocol;
__u8 iInterface;
-} __attribute__ ((packed));
+} __packed;
#define USB_DT_INTERFACE_SIZE 9
@@ -365,7 +365,7 @@ struct usb_endpoint_descriptor {
/* use USB_DT_ENDPOINT*_SIZE in bLength, not sizeof. */
__u8 bRefresh;
__u8 bSynchAddress;
-} __attribute__ ((packed));
+} __packed;
#define USB_DT_ENDPOINT_SIZE 7
#define USB_DT_ENDPOINT_AUDIO_SIZE 9 /* Audio extension */
@@ -580,7 +580,7 @@ struct usb_ss_ep_comp_descriptor {
__u8 bMaxBurst;
__u8 bmAttributes;
__u16 wBytesPerInterval;
-} __attribute__ ((packed));
+} __packed;
#define USB_DT_SS_EP_COMP_SIZE 6
/* Bits 4:0 of bmAttributes if this is a bulk endpoint */
@@ -600,7 +600,7 @@ struct usb_qualifier_descriptor {
__u8 bMaxPacketSize0;
__u8 bNumConfigurations;
__u8 bRESERVED;
-} __attribute__ ((packed));
+} __packed;
/*-------------------------------------------------------------------------*/
@@ -611,7 +611,7 @@ struct usb_otg_descriptor {
__u8 bDescriptorType;
__u8 bmAttributes; /* support for HNP, SRP, etc */
-} __attribute__ ((packed));
+} __packed;
/* from usb_otg_descriptor.bmAttributes */
#define USB_OTG_SRP (1 << 0)
@@ -642,7 +642,7 @@ struct usb_interface_assoc_descriptor {
__u8 bFunctionSubClass;
__u8 bFunctionProtocol;
__u8 iFunction;
-} __attribute__ ((packed));
+} __packed;
/*-------------------------------------------------------------------------*/
diff --git a/include/linux/usb/ehci_def.h b/include/linux/usb/ehci_def.h
index 2e262cb..9368f1c 100644
--- a/include/linux/usb/ehci_def.h
+++ b/include/linux/usb/ehci_def.h
@@ -52,7 +52,7 @@ struct ehci_caps {
#define HCC_PGM_FRAMELISTLEN(p) ((p)&(1 << 1)) /* true: periodic_size changes*/
#define HCC_64BIT_ADDR(p) ((p)&(1)) /* true: can use 64-bit addr */
u8 portroute[8]; /* nibbles for routing - offset 0xC */
-} __attribute__ ((packed));
+} __packed;
/* Section 2.3 Host Controller Operational Registers */
@@ -148,7 +148,7 @@ struct ehci_regs {
#define PORT_CSC (1<<1) /* connect status change */
#define PORT_CONNECT (1<<0) /* device connected */
#define PORT_RWC_BITS (PORT_CSC | PORT_PEC | PORT_OCC)
-} __attribute__ ((packed));
+} __packed;
#define USBMODE 0x68 /* USB Device mode */
#define USBMODE_SDIS (1<<3) /* Stream disable */
@@ -192,7 +192,7 @@ struct ehci_dbg_port {
u32 data47;
u32 address;
#define DBGP_EPADDR(dev, ep) (((dev)<<8)|(ep))
-} __attribute__ ((packed));
+} __packed;
#ifdef CONFIG_EARLY_PRINTK_DBGP
#include <linux/init.h>
diff --git a/include/linux/usb/irda.h b/include/linux/usb/irda.h
index e345cea..5b924f4 100644
--- a/include/linux/usb/irda.h
+++ b/include/linux/usb/irda.h
@@ -98,7 +98,7 @@ struct usb_irda_cs_descriptor {
__u8 bmAdditionalBOFs;
__u8 bIrdaRateSniff;
__u8 bMaxUnicastList;
-} __attribute__ ((packed));
+} __packed;
/*-------------------------------------------------------------------------*/
diff --git a/include/linux/usb/langwell_udc.h b/include/linux/usb/langwell_udc.h
index 2d2d1bb..1728490 100644
--- a/include/linux/usb/langwell_udc.h
+++ b/include/linux/usb/langwell_udc.h
@@ -61,7 +61,7 @@ struct langwell_cap_regs {
#define DEVCAP BIT(7) /* device capable */
#define DEN(d) \
(((d)>>0)&0x1f) /* bits 4:0, device endpoint number */
-} __attribute__ ((packed));
+} __packed;
/* Operational Registers, BAR0 + OP_REG_OFFSET */
@@ -304,7 +304,7 @@ struct langwell_op_regs {
#define EPCTRL_RXT_SHIFT 2 /* bits 19:18, TX endpoint type */
#define EPCTRL_RXD BIT(1) /* RX endpoint data sink */
#define EPCTRL_RXS BIT(0) /* RX endpoint STALL */
-} __attribute__ ((packed));
+} __packed;
#endif /* __LANGWELL_UDC_H */
diff --git a/include/linux/usb/midi.h b/include/linux/usb/midi.h
index 1d10408..15749c7 100644
--- a/include/linux/usb/midi.h
+++ b/include/linux/usb/midi.h
@@ -40,7 +40,7 @@ struct usb_ms_header_descriptor {
__u8 bDescriptorSubtype;
__le16 bcdMSC;
__le16 wTotalLength;
-} __attribute__ ((packed));
+} __packed;
#define USB_DT_MS_HEADER_SIZE 7
@@ -52,14 +52,14 @@ struct usb_midi_in_jack_descriptor {
__u8 bJackType; /* USB_MS_EMBEDDED/EXTERNAL */
__u8 bJackID;
__u8 iJack;
-} __attribute__ ((packed));
+} __packed;
#define USB_DT_MIDI_IN_SIZE 6
struct usb_midi_source_pin {
__u8 baSourceID;
__u8 baSourcePin;
-} __attribute__ ((packed));
+} __packed;
/* 6.1.2.3 MIDI OUT Jack Descriptor */
struct usb_midi_out_jack_descriptor {
@@ -71,7 +71,7 @@ struct usb_midi_out_jack_descriptor {
__u8 bNrInputPins; /* p */
struct usb_midi_source_pin pins[]; /* [p] */
/*__u8 iJack; -- ommitted due to variable-sized pins[] */
-} __attribute__ ((packed));
+} __packed;
#define USB_DT_MIDI_OUT_SIZE(p) (7 + 2 * (p))
@@ -86,7 +86,7 @@ struct usb_midi_out_jack_descriptor_##p { \
__u8 bNrInputPins; \
struct usb_midi_source_pin pins[p]; \
__u8 iJack; \
-} __attribute__ ((packed))
+} __packed
/* 6.2.2 Class-Specific MS Bulk Data Endpoint Descriptor */
struct usb_ms_endpoint_descriptor {
@@ -95,7 +95,7 @@ struct usb_ms_endpoint_descriptor {
__u8 bDescriptorSubtype; /* USB_MS_GENERAL */
__u8 bNumEmbMIDIJack; /* n */
__u8 baAssocJackID[]; /* [n] */
-} __attribute__ ((packed));
+} __packed;
#define USB_DT_MS_ENDPOINT_SIZE(n) (4 + (n))
@@ -107,6 +107,6 @@ struct usb_ms_endpoint_descriptor_##n { \
__u8 bDescriptorSubtype; \
__u8 bNumEmbMIDIJack; \
__u8 baAssocJackID[n]; \
-} __attribute__ ((packed))
+} __packed
#endif /* __LINUX_USB_MIDI_H */
diff --git a/include/linux/usb/musb.h b/include/linux/usb/musb.h
index eb50525..23f8003 100644
--- a/include/linux/usb/musb.h
+++ b/include/linux/usb/musb.h
@@ -26,12 +26,12 @@ enum musb_fifo_style {
FIFO_RXTX,
FIFO_TX,
FIFO_RX
-} __attribute__ ((packed));
+} __packed;
enum musb_buf_mode {
BUF_SINGLE,
BUF_DOUBLE
-} __attribute__ ((packed));
+} __packed;
struct musb_fifo_cfg {
u8 hw_ep_num;
diff --git a/include/linux/usb/net2280.h b/include/linux/usb/net2280.h
index 148b8fa..465ec95 100644
--- a/include/linux/usb/net2280.h
+++ b/include/linux/usb/net2280.h
@@ -232,7 +232,7 @@ struct net2280_regs {
#define GPIO2_INTERRUPT 2
#define GPIO1_INTERRUPT 1
#define GPIO0_INTERRUPT 0
-} __attribute__ ((packed));
+} __packed;
/* usb control, BAR0 + 0x0080 */
struct net2280_usb_regs {
@@ -296,7 +296,7 @@ struct net2280_usb_regs {
#define FORCE_IMMEDIATE 7
#define OUR_USB_ADDRESS 0
u32 ourconfig;
-} __attribute__ ((packed));
+} __packed;
/* pci control, BAR0 + 0x0100 */
struct net2280_pci_regs {
@@ -323,7 +323,7 @@ struct net2280_pci_regs {
#define PCI_ARBITER_CLEAR 2
#define PCI_EXTERNAL_ARBITER 1
#define PCI_HOST_MODE 0
-} __attribute__ ((packed));
+} __packed;
/* dma control, BAR0 + 0x0180 ... array of four structs like this,
* for channels 0..3. see also struct net2280_dma: descriptor
@@ -365,7 +365,7 @@ struct net2280_dma_regs { /* [11.7] */
u32 dmaaddr;
u32 dmadesc;
u32 _unused1;
-} __attribute__ ((packed));
+} __packed;
/* dedicated endpoint registers, BAR0 + 0x0200 */
@@ -375,7 +375,7 @@ struct net2280_dep_regs { /* [11.8] */
/* offset 0x0204, 0x0214, 0x224, 0x234, 0x244 */
u32 dep_rsp;
u32 _unused[2];
-} __attribute__ ((packed));
+} __packed;
/* configurable endpoint registers, BAR0 + 0x0300 ... array of seven structs
* like this, for ep0 then the configurable endpoints A..F
@@ -438,6 +438,6 @@ struct net2280_ep_regs { /* [11.9] */
u32 ep_avail;
u32 ep_data;
u32 _unused0[2];
-} __attribute__ ((packed));
+} __packed;
#endif /* __LINUX_USB_NET2280_H */
diff --git a/include/linux/usb/rndis_host.h b/include/linux/usb/rndis_host.h
index 05ef528..b6763ff 100644
--- a/include/linux/usb/rndis_host.h
+++ b/include/linux/usb/rndis_host.h
@@ -38,7 +38,7 @@ struct rndis_msg_hdr {
__le32 request_id;
__le32 status;
/* ... and more */
-} __attribute__ ((packed));
+} __packed;
/* MS-Windows uses this strange size, but RNDIS spec says 1024 minimum */
#define CONTROL_BUFFER_SIZE 1025
@@ -104,7 +104,7 @@ struct rndis_data_hdr {
__le32 packet_data_len; /* zero */
__le32 vc_handle; /* zero */
__le32 reserved; /* zero */
-} __attribute__ ((packed));
+} __packed;
struct rndis_init { /* OUT */
/* header and: */
@@ -114,7 +114,7 @@ struct rndis_init { /* OUT */
__le32 major_version; /* of rndis (1.0) */
__le32 minor_version;
__le32 max_transfer_size;
-} __attribute__ ((packed));
+} __packed;
struct rndis_init_c { /* IN */
/* header and: */
@@ -131,14 +131,14 @@ struct rndis_init_c { /* IN */
__le32 packet_alignment; /* max 7; (1<<n) bytes */
__le32 af_list_offset; /* zero */
__le32 af_list_size; /* zero */
-} __attribute__ ((packed));
+} __packed;
struct rndis_halt { /* OUT (no reply) */
/* header and: */
__le32 msg_type; /* RNDIS_MSG_HALT */
__le32 msg_len;
__le32 request_id;
-} __attribute__ ((packed));
+} __packed;
struct rndis_query { /* OUT */
/* header and: */
@@ -149,7 +149,7 @@ struct rndis_query { /* OUT */
__le32 len;
__le32 offset;
/*?*/ __le32 handle; /* zero */
-} __attribute__ ((packed));
+} __packed;
struct rndis_query_c { /* IN */
/* header and: */
@@ -159,7 +159,7 @@ struct rndis_query_c { /* IN */
__le32 status;
__le32 len;
__le32 offset;
-} __attribute__ ((packed));
+} __packed;
struct rndis_set { /* OUT */
/* header and: */
@@ -170,7 +170,7 @@ struct rndis_set { /* OUT */
__le32 len;
__le32 offset;
/*?*/ __le32 handle; /* zero */
-} __attribute__ ((packed));
+} __packed;
struct rndis_set_c { /* IN */
/* header and: */
@@ -178,14 +178,14 @@ struct rndis_set_c { /* IN */
__le32 msg_len;
__le32 request_id;
__le32 status;
-} __attribute__ ((packed));
+} __packed;
struct rndis_reset { /* IN */
/* header and: */
__le32 msg_type; /* RNDIS_MSG_RESET */
__le32 msg_len;
__le32 reserved;
-} __attribute__ ((packed));
+} __packed;
struct rndis_reset_c { /* OUT */
/* header and: */
@@ -193,7 +193,7 @@ struct rndis_reset_c { /* OUT */
__le32 msg_len;
__le32 status;
__le32 addressing_lost;
-} __attribute__ ((packed));
+} __packed;
struct rndis_indicate { /* IN (unrequested) */
/* header and: */
@@ -205,14 +205,14 @@ struct rndis_indicate { /* IN (unrequested) */
/**/ __le32 diag_status;
__le32 error_offset;
/**/ __le32 message;
-} __attribute__ ((packed));
+} __packed;
struct rndis_keepalive { /* OUT (optionally IN) */
/* header and: */
__le32 msg_type; /* RNDIS_MSG_KEEPALIVE */
__le32 msg_len;
__le32 request_id;
-} __attribute__ ((packed));
+} __packed;
struct rndis_keepalive_c { /* IN (optionally OUT) */
/* header and: */
@@ -220,7 +220,7 @@ struct rndis_keepalive_c { /* IN (optionally OUT) */
__le32 msg_len;
__le32 request_id;
__le32 status;
-} __attribute__ ((packed));
+} __packed;
/* NOTE: about 30 OIDs are "mandatory" for peripherals to support ... and
* there are gobs more that may optionally be supported. We'll avoid as much
diff --git a/include/linux/usb/video.h b/include/linux/usb/video.h
index 3b3b95e..3f3415a 100644
--- a/include/linux/usb/video.h
+++ b/include/linux/usb/video.h
@@ -215,7 +215,7 @@ struct UVC_HEADER_DESCRIPTOR(n) { \
__u32 dwClockFrequency; \
__u8 bInCollection; \
__u8 baInterfaceNr[n]; \
-} __attribute__ ((packed))
+} __packed
/* 3.7.2.1. Input Terminal Descriptor */
struct uvc_input_terminal_descriptor {
@@ -287,7 +287,7 @@ struct UVC_SELECTOR_UNIT_DESCRIPTOR(n) { \
__u8 bNrInPins; \
__u8 baSourceID[n]; \
__u8 iSelector; \
-} __attribute__ ((packed))
+} __packed
/* 3.7.2.5. Processing Unit Descriptor */
struct uvc_processing_unit_descriptor {
@@ -337,7 +337,7 @@ struct UVC_EXTENSION_UNIT_DESCRIPTOR(p, n) { \
__u8 bControlSize; \
__u8 bmControls[n]; \
__u8 iExtension; \
-} __attribute__ ((packed))
+} __packed
/* 3.8.2.2. Video Control Interrupt Endpoint Descriptor */
struct uvc_control_endpoint_descriptor {
@@ -386,7 +386,7 @@ struct UVC_INPUT_HEADER_DESCRIPTOR(n, p) { \
__u8 bTriggerUsage; \
__u8 bControlSize; \
__u8 bmaControls[p][n]; \
-} __attribute__ ((packed))
+} __packed
/* 3.9.2.2. Output Header Descriptor */
struct uvc_output_header_descriptor {
@@ -417,7 +417,7 @@ struct UVC_OUTPUT_HEADER_DESCRIPTOR(n, p) { \
__u8 bTerminalLink; \
__u8 bControlSize; \
__u8 bmaControls[p][n]; \
-} __attribute__ ((packed))
+} __packed
/* 3.9.2.6. Color matching descriptor */
struct uvc_color_matching_descriptor {
@@ -506,7 +506,7 @@ struct UVC_FRAME_UNCOMPRESSED(n) { \
__u32 dwDefaultFrameInterval; \
__u8 bFrameIntervalType; \
__u32 dwFrameInterval[n]; \
-} __attribute__ ((packed))
+} __packed
/* MJPEG Payload - 3.1.1. MJPEG Video Format Descriptor */
struct uvc_format_mjpeg {
@@ -562,7 +562,7 @@ struct UVC_FRAME_MJPEG(n) { \
__u32 dwDefaultFrameInterval; \
__u8 bFrameIntervalType; \
__u32 dwFrameInterval[n]; \
-} __attribute__ ((packed))
+} __packed
#endif /* __LINUX_USB_VIDEO_H */
diff --git a/include/linux/usb/wusb-wa.h b/include/linux/usb/wusb-wa.h
index f9dec37..1e0c77b 100644
--- a/include/linux/usb/wusb-wa.h
+++ b/include/linux/usb/wusb-wa.h
@@ -107,7 +107,7 @@ struct usb_rpipe_descriptor {
u8 bmCharacteristics; /* ro? enum rpipe_attr, supported xsactions */
u8 bmRetryOptions; /* rw? */
__le16 wNumTransactionErrors; /* rw */
-} __attribute__ ((packed));
+} __packed;
/**
* Wire Adapter Notification types ([WUSB] sections 8.4.5 & 8.5.4)
--
1.7.4.rc2
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
