Merge branch 'late/cleanup' into devel-late

[~andy/linux] / drivers / staging / bcm / Adapter.h

diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index 42291eed33d6bc355a8bcfcb44a52546a87bb3c8..aa51d17be5a1cbdd0b8413fc1c36542715467700 100644 (file)
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -12,26 +12,26 @@ struct _LEADER {
        USHORT  PLength;
        UCHAR   Status;
        UCHAR   Unused[3];
-} __attribute__((packed));
+} __packed;
 typedef struct _LEADER LEADER, *PLEADER;
 
 struct _PACKETTOSEND {
        LEADER  Leader;
        UCHAR   ucPayload;
-} __attribute__((packed));
+} __packed;
 typedef struct _PACKETTOSEND PACKETTOSEND, *PPACKETTOSEND;
 
 struct _CONTROL_PACKET {
        PVOID   ControlBuff;
        UINT    ControlBuffLen;
        struct _CONTROL_PACKET *next;
-} __attribute__((packed));
+} __packed;
 typedef struct _CONTROL_PACKET CONTROL_PACKET, *PCONTROL_PACKET;
 
 struct link_request {
        LEADER  Leader;
        UCHAR   szData[4];
-} __attribute__((packed));
+} __packed;
 typedef struct link_request LINK_REQUEST, *PLINK_REQUEST;
 
 /* classification extension is added */
@@ -244,7 +244,7 @@ typedef struct _PER_TARANG_DATA {
        struct _MINI_ADAPTER    *Adapter;
        struct sk_buff          *RxAppControlHead;
        struct sk_buff          *RxAppControlTail;
-       volatile INT            AppCtrlQueueLen;
+       int                     AppCtrlQueueLen;
        BOOLEAN                 MacTracingEnabled;
        BOOLEAN                 bApplicationToExit;
        S_MIBS_DROPPED_APP_CNTRL_MESSAGES       stDroppedAppCntrlMsgs;
@@ -338,9 +338,9 @@ typedef struct _STTARGETDSXBUFFER {
        BOOLEAN         valid;
 } STTARGETDSXBUFFER, *PSTTARGETDSXBUFFER;
 
-typedef INT (*FP_FLASH_WRITE)(struct _MINI_ADAPTER *, UINT, PVOID);
+typedef int (*FP_FLASH_WRITE)(struct _MINI_ADAPTER *, UINT, PVOID);
 
-typedef INT (*FP_FLASH_WRITE_STATUS)(struct _MINI_ADAPTER *, UINT, PVOID);
+typedef int (*FP_FLASH_WRITE_STATUS)(struct _MINI_ADAPTER *, UINT, PVOID);
 
 /*
  * Driver adapter data structure
@@ -351,8 +351,6 @@ struct _MINI_ADAPTER {
        u32                     msg_enable;
        CHAR                    *caDsxReqResp;
        atomic_t                ApplicationRunning;
-       volatile INT            CtrlQueueLen;
-       atomic_t                AppCtrlQueueLen;
        BOOLEAN                 AppCtrlQueueOverFlow;
        atomic_t                CurrentApplicationCount;
        atomic_t                RegisteredApplicationCount;
@@ -425,7 +423,7 @@ struct _MINI_ADAPTER {
        BOOLEAN                 DeviceAccess;
        BOOLEAN                 bIsAutoCorrectEnabled;
        BOOLEAN                 bDDRInitDone;
-       INT                     DDRSetting;
+       int                     DDRSetting;
        ULONG                   ulPowerSaveMode;
        spinlock_t              txtransmitlock;
        B_UINT8                 txtransmit_running;
@@ -447,14 +445,14 @@ struct _MINI_ADAPTER {
        int (*bcm_file_readback_from_chip)(PVOID,
                                        struct file *,
                                        unsigned int);
-       INT (*interface_rdm)(PVOID,
+       int (*interface_rdm)(PVOID,
                        UINT,
                        PVOID,
-                       INT);
-       INT (*interface_wrm)(PVOID,
+                       int);
+       int (*interface_wrm)(PVOID,
                        UINT,
                        PVOID,
-                       INT);
+                       int);
        int (*interface_transmit)(PVOID, PVOID , UINT);
        BOOLEAN                 IdleMode;
        BOOLEAN                 bDregRequestSentInIdleMode;
@@ -512,7 +510,7 @@ struct _MINI_ADAPTER {
        BOOLEAN                 bSigCorrupted;
        /* this should be set who so ever want to change the Headers. after Wrtie it should be reset immediately. */
        BOOLEAN                 bHeaderChangeAllowed;
-       INT                     SelectedChip;
+       int                     SelectedChip;
        BOOLEAN                 bEndPointHalted;
        /* while bFlashRawRead will be true, Driver  ignore map lay out and consider flash as of without any map. */
        BOOLEAN                 bFlashRawRead;
@@ -534,14 +532,14 @@ struct _ETH_HEADER_STRUC {
        UCHAR   au8DestinationAddress[6];
        UCHAR   au8SourceAddress[6];
        USHORT  u16Etype;
-} __attribute__((packed));
+} __packed;
 typedef struct _ETH_HEADER_STRUC ETH_HEADER_STRUC, *PETH_HEADER_STRUC;
 
 typedef struct FirmwareInfo {
        void    __user *pvMappedFirmwareAddress;
        ULONG   u32FirmwareLength;
        ULONG   u32StartingAddress;
-} __attribute__((packed)) FIRMWARE_INFO, *PFIRMWARE_INFO;
+} __packed FIRMWARE_INFO, *PFIRMWARE_INFO;
 
 /* holds the value of net_device structure.. */
 extern struct net_device *gblpnetdev;
@@ -556,7 +554,7 @@ typedef struct _DDR_SETTING {
        UINT ulRegValue;
 } DDR_SETTING, *PDDR_SETTING;
 typedef DDR_SETTING DDR_SET_NODE, *PDDR_SET_NODE;
-INT InitAdapter(PMINI_ADAPTER psAdapter);
+int InitAdapter(PMINI_ADAPTER psAdapter);
 
 /* =====================================================================
  * Beceem vendor request codes for EP0