The reformatting of case blocks has shortened some lines such that
previously split lines can be rejoined without exceeding 80
characters. Rejoined those lines.

Signed-off-by: Tim Collier <osde...@gmail.com>
---
 drivers/staging/wlan-ng/hfa384x_usb.c |  6 ++----
 drivers/staging/wlan-ng/prism2sta.c   | 17 ++++++-----------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c 
b/drivers/staging/wlan-ng/hfa384x_usb.c
index fb32aaf13628..6261881e9bcd 100644
--- a/drivers/staging/wlan-ng/hfa384x_usb.c
+++ b/drivers/staging/wlan-ng/hfa384x_usb.c
@@ -3611,8 +3611,7 @@ static void hfa384x_usbout_callback(struct urb *urb)
                        netdev_warn(hw->wlandev->netdev,
                                    "%s tx pipe stalled: requesting reset\n",
                                    wlandev->netdev->name);
-                       if (!test_and_set_bit
-                           (WORK_TX_HALT, &hw->usb_flags))
+                       if (!test_and_set_bit(WORK_TX_HALT, &hw->usb_flags))
                                schedule_work(&hw->usb_work);
                        wlandev->netdev->stats.tx_errors++;
                        break;
@@ -3623,8 +3622,7 @@ static void hfa384x_usbout_callback(struct urb *urb)
                case -EILSEQ: {
                        struct hfa384x *hw = wlandev->priv;
 
-                       if (!test_and_set_bit
-                           (THROTTLE_TX, &hw->usb_flags) &&
+                       if (!test_and_set_bit(THROTTLE_TX, &hw->usb_flags) &&
                            !timer_pending(&hw->throttle)) {
                                mod_timer(&hw->throttle,
                                          jiffies + THROTTLE_JIFFIES);
diff --git a/drivers/staging/wlan-ng/prism2sta.c 
b/drivers/staging/wlan-ng/prism2sta.c
index b720f564ecde..fb5441399131 100644
--- a/drivers/staging/wlan-ng/prism2sta.c
+++ b/drivers/staging/wlan-ng/prism2sta.c
@@ -341,9 +341,8 @@ static int prism2sta_mlmerequest(struct wlandevice *wlandev,
 
                pr_debug("Received mlme ifstate request\n");
                ifstatemsg = (struct p80211msg_lnxreq_ifstate *)msg;
-               result =
-                       prism2sta_ifstate(wlandev,
-                                         ifstatemsg->ifstate.data);
+               result = prism2sta_ifstate(wlandev,
+                                          ifstatemsg->ifstate.data);
                ifstatemsg->resultcode.status =
                        P80211ENUM_msgitem_status_data_ok;
                ifstatemsg->resultcode.data = result;
@@ -365,16 +364,12 @@ static int prism2sta_mlmerequest(struct wlandevice 
*wlandev,
 
                qualmsg = (struct p80211msg_lnxreq_commsquality *)msg;
 
-               qualmsg->link.status =
-                       P80211ENUM_msgitem_status_data_ok;
-               qualmsg->level.status =
-                       P80211ENUM_msgitem_status_data_ok;
-               qualmsg->noise.status =
-                       P80211ENUM_msgitem_status_data_ok;
+               qualmsg->link.status = P80211ENUM_msgitem_status_data_ok;
+               qualmsg->level.status = P80211ENUM_msgitem_status_data_ok;
+               qualmsg->noise.status = P80211ENUM_msgitem_status_data_ok;
 
                qualmsg->link.data = le16_to_cpu(hw->qual.cq_curr_bss);
-               qualmsg->level.data =
-                       le16_to_cpu(hw->qual.asl_curr_bss);
+               qualmsg->level.data = le16_to_cpu(hw->qual.asl_curr_bss);
                qualmsg->noise.data = le16_to_cpu(hw->qual.anl_curr_fc);
                qualmsg->txrate.data = hw->txrate;
 
-- 
2.11.0

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Reply via email to