Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-commands.h

1 files changed, 12 insertions, 12 deletions

diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index 6b605df8a923..1d05445d4ba3 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -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;