Staging: wlan-ng - checkpatch.pl fixups

Basic fixups in the staging/wlan-ng directory.
(First kernel patch - thanks to FOSDEM talk)

Signed-off-by: Andrew Elwell <Andrew.Elwell@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 11 insertions, 12 deletions

diff --git a/drivers/staging/wlan-ng/prism2sta.c b/drivers/staging/wlan-ng/prism2sta.c
index 50f301d6521..32a3db85462 100644
--- a/drivers/staging/wlan-ng/prism2sta.c
+++ b/drivers/staging/wlan-ng/prism2sta.c
@@ -64,7 +64,7 @@
 #include <linux/byteorder/generic.h>
 #include <linux/ctype.h>
 
-#include <asm/io.h>
+#include <linux/io.h>
 #include <linux/delay.h>
 #include <asm/byteorder.h>
 #include <linux/if_arp.h>
@@ -1023,13 +1023,13 @@ static void prism2sta_inf_tallies(wlandevice_t *wlandev,
 
         cnt = sizeof(hfa384x_CommTallies32_t) / sizeof(u32);
         if (inf->framelen > 22) {
-                dst = (u32 *) & hw->tallies;
-                src32 = (u32 *) & inf->info.commtallies32;
+                dst = (u32 *) &hw->tallies;
+                src32 = (u32 *) &inf->info.commtallies32;
                 for (i = 0; i < cnt; i++, dst++, src32++)
                         *dst += le32_to_cpu(*src32);
         } else {
-                dst = (u32 *) & hw->tallies;
-                src16 = (u16 *) & inf->info.commtallies16;
+                dst = (u32 *) &hw->tallies;
+                src16 = (u16 *) &inf->info.commtallies16;
                 for (i = 0; i < cnt; i++, dst++, src16++)
                         *dst += le16_to_cpu(*src16);
         }
@@ -1280,9 +1280,8 @@ void prism2sta_processing_defer(struct work_struct *data)
                                      HFA384x_RID_CURRENTSSID, result);
                                 goto failed;
                         }
-                        prism2mgmt_bytestr2pstr((hfa384x_bytestr_t *) & ssid,
-                                                (p80211pstrd_t *) &
-                                                wlandev->ssid);
+                        prism2mgmt_bytestr2pstr((hfa384x_bytestr_t *) &ssid,
+                                                (p80211pstrd_t *) &wlandev->ssid);
 
                         /* Collect the port status */
                         result = hfa384x_drvr_getconfig16(hw,
@@ -1368,8 +1367,8 @@ void prism2sta_processing_defer(struct work_struct *data)
                                  HFA384x_RID_CURRENTSSID, result);
                         goto failed;
                 }
-                prism2mgmt_bytestr2pstr((hfa384x_bytestr_t *) & ssid,
-                                        (p80211pstrd_t *) & wlandev->ssid);
+                prism2mgmt_bytestr2pstr((hfa384x_bytestr_t *) &ssid,
+                                        (p80211pstrd_t *) &wlandev->ssid);
 
                 hw->link_status = HFA384x_LINK_CONNECTED;
                 netif_carrier_on(wlandev->netdev);
@@ -2028,8 +2027,8 @@ void prism2sta_commsqual_defer(struct work_struct *data)
                          HFA384x_RID_CURRENTSSID, result);
                 goto done;
         }
-        prism2mgmt_bytestr2pstr((hfa384x_bytestr_t *) & ssid,
-                                (p80211pstrd_t *) & wlandev->ssid);
+        prism2mgmt_bytestr2pstr((hfa384x_bytestr_t *) &ssid,
+                                (p80211pstrd_t *) &wlandev->ssid);
 
         /* Reschedule timer */
         mod_timer(&hw->commsqual_timer, jiffies + HZ);