Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

staging:wlan-ng: cleanup prism2sta_commsqual_defer and hfa384x_drvr_getconfig

Browse source 
the function prism2sta_commsqual_defer defines a goto done lable, which just
jumps to end of function, which we can achieve with out it

the hfa384x_drvr_getconfig doesn't need the result variable, we can
remove and just return the function

Signed-off-by: Devendra Naga <devendra.aaru@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Devendra Naga 2012-09-09 18:41:00 +05:30 committed by Greg Kroah-Hartman
parent 311e24fb1a
commit 102db1fc4a
2 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/staging/wlan-ng/hfa384x_usb.c
View file

@ -2140,11 +2140,7 @@ int hfa384x_drvr_flashdl_write(hfa384x_t *hw, u32 daddr, void *buf, u32 len)
----------------------------------------------------------------*/
int hfa384x_drvr_getconfig(hfa384x_t *hw, u16 rid, void *buf, u16 len)
{
int result;
result = hfa384x_dorrid_wait(hw, rid, buf, len);
return result;
return hfa384x_dorrid_wait(hw, rid, buf, len);
}
/*----------------------------------------------------------------

15
drivers/staging/wlan-ng/prism2sta.c
View file

@ -1988,12 +1988,12 @@ void prism2sta_commsqual_defer(struct work_struct *data)
int result = 0;
if (hw->wlandev->hwremoved)
goto done;
return;
/* we don't care if we're in AP mode */
if ((wlandev->macmode == WLAN_MACMODE_NONE) ||
(wlandev->macmode == WLAN_MACMODE_ESS_AP)) {
goto done;
return;
}
/* It only makes sense to poll these in non-IBSS */
@ -2004,7 +2004,7 @@ void prism2sta_commsqual_defer(struct work_struct *data)
if (result) {
printk(KERN_ERR "error fetching commsqual\n");
goto done;
return;
}
pr_debug("commsqual %d %d %d\n",
@ -2021,7 +2021,7 @@ void prism2sta_commsqual_defer(struct work_struct *data)
if (result) {
pr_debug("get signal rate failed, result = %d\n",
result);
goto done;
return;
}
switch (mibitem->data) {
@ -2048,7 +2048,7 @@ void prism2sta_commsqual_defer(struct work_struct *data)
if (result) {
pr_debug("getconfig(0x%02x) failed, result = %d\n",
HFA384x_RID_CURRENTBSSID, result);
goto done;
return;
}
result = hfa384x_drvr_getconfig(hw,
@ -2057,16 +2057,13 @@ void prism2sta_commsqual_defer(struct work_struct *data)
if (result) {
pr_debug("getconfig(0x%02x) failed, result = %d\n",
HFA384x_RID_CURRENTSSID, result);
goto done;
return;
}
prism2mgmt_bytestr2pstr((hfa384x_bytestr_t *) &ssid,
(p80211pstrd_t *) &wlandev->ssid);
/* Reschedule timer */
mod_timer(&hw->commsqual_timer, jiffies + HZ);
done:
;
}
void prism2sta_commsqual_timer(unsigned long data)