tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

staging: wlan-ng: rejoin split lines shortened by case changes

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 <osdevtc@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Tim Collier and committed by
Greg Kroah-Hartman 82ade3e5 27575665

+8 -15
+2 -4
drivers/staging/wlan-ng/hfa384x_usb.c
··· 3611 3611 netdev_warn(hw->wlandev->netdev, 3612 3612 "%s tx pipe stalled: requesting reset\n", 3613 3613 wlandev->netdev->name); 3614 - if (!test_and_set_bit 3615 - (WORK_TX_HALT, &hw->usb_flags)) 3614 + if (!test_and_set_bit(WORK_TX_HALT, &hw->usb_flags)) 3616 3615 schedule_work(&hw->usb_work); 3617 3616 wlandev->netdev->stats.tx_errors++; 3618 3617 break; ··· 3622 3623 case -EILSEQ: { 3623 3624 struct hfa384x *hw = wlandev->priv; 3624 3625 3625 - if (!test_and_set_bit 3626 - (THROTTLE_TX, &hw->usb_flags) && 3626 + if (!test_and_set_bit(THROTTLE_TX, &hw->usb_flags) && 3627 3627 !timer_pending(&hw->throttle)) { 3628 3628 mod_timer(&hw->throttle, 3629 3629 jiffies + THROTTLE_JIFFIES);
+6 -11
drivers/staging/wlan-ng/prism2sta.c
··· 341 341 342 342 pr_debug("Received mlme ifstate request\n"); 343 343 ifstatemsg = (struct p80211msg_lnxreq_ifstate *)msg; 344 - result = 345 - prism2sta_ifstate(wlandev, 346 - ifstatemsg->ifstate.data); 344 + result = prism2sta_ifstate(wlandev, 345 + ifstatemsg->ifstate.data); 347 346 ifstatemsg->resultcode.status = 348 347 P80211ENUM_msgitem_status_data_ok; 349 348 ifstatemsg->resultcode.data = result; ··· 364 365 365 366 qualmsg = (struct p80211msg_lnxreq_commsquality *)msg; 366 367 367 - qualmsg->link.status = 368 - P80211ENUM_msgitem_status_data_ok; 369 - qualmsg->level.status = 370 - P80211ENUM_msgitem_status_data_ok; 371 - qualmsg->noise.status = 372 - P80211ENUM_msgitem_status_data_ok; 368 + qualmsg->link.status = P80211ENUM_msgitem_status_data_ok; 369 + qualmsg->level.status = P80211ENUM_msgitem_status_data_ok; 370 + qualmsg->noise.status = P80211ENUM_msgitem_status_data_ok; 373 371 374 372 qualmsg->link.data = le16_to_cpu(hw->qual.cq_curr_bss); 375 - qualmsg->level.data = 376 - le16_to_cpu(hw->qual.asl_curr_bss); 373 + qualmsg->level.data = le16_to_cpu(hw->qual.asl_curr_bss); 377 374 qualmsg->noise.data = le16_to_cpu(hw->qual.anl_curr_fc); 378 375 qualmsg->txrate.data = hw->txrate; 379 376