Merge remote-tracking branch 'staging/staging-next'

[deliverable/linux.git] / drivers / staging / wlan-ng / prism2usb.c

diff --git a/drivers/staging/wlan-ng/prism2usb.c b/drivers/staging/wlan-ng/prism2usb.c
index b26d09ff840c1238b0dbca0e477941c5f82f5466..0463ec16802c0ae264bc4444aac109f74e985217 100644 (file)
--- a/drivers/staging/wlan-ng/prism2usb.c
+++ b/drivers/staging/wlan-ng/prism2usb.c
@@ -47,11 +47,11 @@ static const struct usb_device_id usb_prism_tbl[] = {
        PRISM_DEV(0x0bb2, 0x0302, "Ambit Microsystems Corp."),
        PRISM_DEV(0x9016, 0x182d, "Sitecom WL-022 802.11b USB Adapter"),
        PRISM_DEV(0x0543, 0x0f01,
-               "ViewSonic Airsync USB Adapter 11Mbps (Prism2.5)"),
+                 "ViewSonic Airsync USB Adapter 11Mbps (Prism2.5)"),
        PRISM_DEV(0x067c, 0x1022,
-               "Siemens SpeedStream 1022 11Mbps WLAN USB Adapter"),
+                 "Siemens SpeedStream 1022 11Mbps WLAN USB Adapter"),
        PRISM_DEV(0x049f, 0x0033,
-               "Compaq/Intel W100 PRO/Wireless 11Mbps multiport WLAN Adapter"),
+                 "Compaq/Intel W100 PRO/Wireless 11Mbps multiport WLAN Adapter"),
        { } /* terminator */
 };
 MODULE_DEVICE_TABLE(usb, usb_prism_tbl);
@@ -74,7 +74,7 @@ static int prism2sta_probe_usb(struct usb_interface *interface,
        }
        hw = wlandev->priv;
 
-       if (wlan_setup(wlandev, &(interface->dev)) != 0) {
+       if (wlan_setup(wlandev, &interface->dev) != 0) {
                dev_err(&interface->dev, "wlan_setup() failed.\n");
                result = -EIO;
                goto failed;
@@ -87,7 +87,7 @@ static int prism2sta_probe_usb(struct usb_interface *interface,
        /* Register the wlandev, this gets us a name and registers the
         * linux netdevice.
         */
-       SET_NETDEV_DEV(wlandev->netdev, &(interface->dev));
+       SET_NETDEV_DEV(wlandev->netdev, &interface->dev);
 
        /* Do a chip-level reset on the MAC */
        if (prism2_doreset) {
@@ -137,7 +137,7 @@ static void prism2sta_disconnect_usb(struct usb_interface *interface)
        wlandevice_t *wlandev;
 
        wlandev = (wlandevice_t *)usb_get_intfdata(interface);
-       if (wlandev != NULL) {
+       if (wlandev) {
                LIST_HEAD(cleanlist);
                hfa384x_usbctlx_t *ctlx, *temp;
                unsigned long flags;
@@ -216,7 +216,7 @@ exit:
 
 #ifdef CONFIG_PM
 static int prism2sta_suspend(struct usb_interface *interface,
-                               pm_message_t message)
+                            pm_message_t message)
 {
        hfa384x_t *hw = NULL;
        wlandevice_t *wlandev;