Merge commit 'v2.6.36-rc1' into kbuild/rc-fixes

1 files changed, 28 insertions, 28 deletions

diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index 3b7ab20a5c54..1d05445d4ba3 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -506,20 +506,20 @@ struct WepKeyRid {
         u8 mac[ETH_ALEN];
         __le16 klen;
         u8 key[16];
-} __attribute__ ((packed));
+} __packed;
 
 /* These structures are from the Aironet's PC4500 Developers Manual */
 typedef struct Ssid Ssid;
 struct Ssid {
         __le16 len;
         u8 ssid[32];
-} __attribute__ ((packed));
+} __packed;
 
 typedef struct SsidRid SsidRid;
 struct SsidRid {
         __le16 len;
         Ssid ssids[3];
-} __attribute__ ((packed));
+} __packed;
 
 typedef struct ModulationRid ModulationRid;
 struct ModulationRid {
@@ -528,7 +528,7 @@ struct ModulationRid {
 #define MOD_DEFAULT cpu_to_le16(0)
 #define MOD_CCK cpu_to_le16(1)
 #define MOD_MOK cpu_to_le16(2)
-} __attribute__ ((packed));
+} __packed;
 
 typedef struct ConfigRid ConfigRid;
 struct ConfigRid {
@@ -652,7 +652,7 @@ struct ConfigRid {
 #define MAGIC_STAY_IN_CAM (1<<10)
         u8 magicControl;
         __le16 autoWake;
-} __attribute__ ((packed));
+} __packed;
 
 typedef struct StatusRid StatusRid;
 struct StatusRid {
@@ -711,20 +711,20 @@ struct StatusRid {
 #define STAT_LEAPFAILED 91
 #define STAT_LEAPTIMEDOUT 92
 #define STAT_LEAPCOMPLETE 93
-} __attribute__ ((packed));
+} __packed;
 
 typedef struct StatsRid StatsRid;
 struct StatsRid {
         __le16 len;
         __le16 spacer;
         __le32 vals[100];
-} __attribute__ ((packed));
+} __packed;
 
 typedef struct APListRid APListRid;
 struct APListRid {
         __le16 len;
         u8 ap[4][ETH_ALEN];
-} __attribute__ ((packed));
+} __packed;
 
 typedef struct CapabilityRid CapabilityRid;
 struct CapabilityRid {
@@ -754,7 +754,7 @@ struct CapabilityRid {
         __le16 bootBlockVer;
         __le16 requiredHard;
         __le16 extSoftCap;
-} __attribute__ ((packed));
+} __packed;
 
 /* Only present on firmware >= 5.30.17 */
 typedef struct BSSListRidExtra BSSListRidExtra;
@@ -762,7 +762,7 @@ struct BSSListRidExtra {
   __le16 unknown[4];
   u8 fixed[12]; /* WLAN management frame */
   u8 iep[624];
-} __attribute__ ((packed));
+} __packed;
 
 typedef struct BSSListRid BSSListRid;
 struct BSSListRid {
@@ -796,7 +796,7 @@ struct BSSListRid {
 
   /* Only present on firmware >= 5.30.17 */
   BSSListRidExtra extra;
-} __attribute__ ((packed));
+} __packed;
 
 typedef struct {
   BSSListRid bss;
@@ -807,13 +807,13 @@ typedef struct tdsRssiEntry tdsRssiEntry;
 struct tdsRssiEntry {
   u8 rssipct;
   u8 rssidBm;
-} __attribute__ ((packed));
+} __packed;
 
 typedef struct tdsRssiRid tdsRssiRid;
 struct tdsRssiRid {
   u16 len;
   tdsRssiEntry x[256];
-} __attribute__ ((packed));
+} __packed;
 
 typedef struct MICRid MICRid;
 struct MICRid {
@@ -823,7 +823,7 @@ struct MICRid {
         u8  multicast[16];
         __le16 unicastValid;
         u8  unicast[16];
-} __attribute__ ((packed));
+} __packed;
 
 typedef struct MICBuffer MICBuffer;
 struct MICBuffer {
@@ -841,7 +841,7 @@ struct MICBuffer {
         } u;
         __be32 mic;
         __be32 seq;
-} __attribute__ ((packed));
+} __packed;
 
 typedef struct {
         u8 da[ETH_ALEN];
@@ -996,7 +996,7 @@ struct rx_hdr {
         u8 rate;
         u8 freq;
         __le16 tmp[4];
-} __attribute__ ((packed));
+} __packed;
 
 typedef struct {
         unsigned int  ctl: 15;
@@ -2931,8 +2931,8 @@ err_out_res:
                 release_region( dev->base_addr, 64 );
 err_out_nets:
         airo_networks_free(ai);
-        del_airo_dev(ai);
 err_out_free:
+        del_airo_dev(ai);
         free_netdev(dev);
         return NULL;
 }
@@ -4657,7 +4657,7 @@ static ssize_t proc_write( struct file *file,
                            loff_t *offset )
 {
         loff_t pos = *offset;
-        struct proc_data *priv = (struct proc_data*)file->private_data;
+        struct proc_data *priv = file->private_data;
 
         if (!priv->wbuffer)
                 return -EINVAL;
@@ -4689,7 +4689,7 @@ static int proc_status_open(struct inode *inode, struct file *file)
 
         if ((file->private_data = kzalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
                 return -ENOMEM;
-        data = (struct proc_data *)file->private_data;
+        data = file->private_data;
         if ((data->rbuffer = kmalloc( 2048, GFP_KERNEL )) == NULL) {
                 kfree (file->private_data);
                 return -ENOMEM;
@@ -4772,7 +4772,7 @@ static int proc_stats_rid_open( struct inode *inode,
 
         if ((file->private_data = kzalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
                 return -ENOMEM;
-        data = (struct proc_data *)file->private_data;
+        data = file->private_data;
         if ((data->rbuffer = kmalloc( 4096, GFP_KERNEL )) == NULL) {
                 kfree (file->private_data);
                 return -ENOMEM;
@@ -5045,7 +5045,7 @@ static int proc_config_open(struct inode *inode, struct file *file)
 
         if ((file->private_data = kzalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
                 return -ENOMEM;
-        data = (struct proc_data *)file->private_data;
+        data = file->private_data;
         if ((data->rbuffer = kmalloc( 2048, GFP_KERNEL )) == NULL) {
                 kfree (file->private_data);
                 return -ENOMEM;
@@ -5127,7 +5127,7 @@ static int proc_config_open(struct inode *inode, struct file *file)
 
 static void proc_SSID_on_close(struct inode *inode, struct file *file)
 {
-        struct proc_data *data = (struct proc_data *)file->private_data;
+        struct proc_data *data = file->private_data;
         struct proc_dir_entry *dp = PDE(inode);
         struct net_device *dev = dp->data;
         struct airo_info *ai = dev->ml_priv;
@@ -5163,7 +5163,7 @@ static void proc_SSID_on_close(struct inode *inode, struct file *file)
 }
 
 static void proc_APList_on_close( struct inode *inode, struct file *file ) {
-        struct proc_data *data = (struct proc_data *)file->private_data;
+        struct proc_data *data = file->private_data;
         struct proc_dir_entry *dp = PDE(inode);
         struct net_device *dev = dp->data;
         struct airo_info *ai = dev->ml_priv;
@@ -5309,7 +5309,7 @@ static void proc_wepkey_on_close( struct inode *inode, struct file *file ) {
 
         memset(key, 0, sizeof(key));
 
-        data = (struct proc_data *)file->private_data;
+        data = file->private_data;
         if ( !data->writelen ) return;
 
         if (data->wbuffer[0] >= '0' && data->wbuffer[0] <= '3' &&
@@ -5363,7 +5363,7 @@ static int proc_wepkey_open( struct inode *inode, struct file *file )
         if ((file->private_data = kzalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
                 return -ENOMEM;
         memset(&wkr, 0, sizeof(wkr));
-        data = (struct proc_data *)file->private_data;
+        data = file->private_data;
         if ((data->rbuffer = kzalloc( 180, GFP_KERNEL )) == NULL) {
                 kfree (file->private_data);
                 return -ENOMEM;
@@ -5409,7 +5409,7 @@ static int proc_SSID_open(struct inode *inode, struct file *file)
 
         if ((file->private_data = kzalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
                 return -ENOMEM;
-        data = (struct proc_data *)file->private_data;
+        data = file->private_data;
         if ((data->rbuffer = kmalloc( 104, GFP_KERNEL )) == NULL) {
                 kfree (file->private_data);
                 return -ENOMEM;
@@ -5453,7 +5453,7 @@ static int proc_APList_open( struct inode *inode, struct file *file ) {
 
         if ((file->private_data = kzalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
                 return -ENOMEM;
-        data = (struct proc_data *)file->private_data;
+        data = file->private_data;
         if ((data->rbuffer = kmalloc( 104, GFP_KERNEL )) == NULL) {
                 kfree (file->private_data);
                 return -ENOMEM;
@@ -5495,7 +5495,7 @@ static int proc_BSSList_open( struct inode *inode, struct file *file ) {
 
         if ((file->private_data = kzalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
                 return -ENOMEM;
-        data = (struct proc_data *)file->private_data;
+        data = file->private_data;
         if ((data->rbuffer = kmalloc( 1024, GFP_KERNEL )) == NULL) {
                 kfree (file->private_data);
                 return -ENOMEM;