diff options
author | Tapasweni Pathak <tapaswenipathak@gmail.com> | 2014-09-22 22:03:43 +0530 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-23 08:14:37 -0700 |
commit | ddcb81e7419baa90fab79dbbb1b983a69a235c91 (patch) | |
tree | 5ad9299b71c0530788888a6d05534e5e790ef26d /drivers/staging/rtl8712/rtl871x_mp.c | |
parent | a988265c61a8e0f4420148c8b62f334b31f49c69 (diff) |
staging: rtl8712: merge lines and remove unused variable for immediate return
This patch merge two lines in a single line if immediate return is found.
Unused variables in each case were removed manually as they are no longer
needed.
This is done using Coccinelle. Semantic patch used for this is as
follows :
@@
expression ret;
identifier f;
@@
-ret =
+return
f(...);
-return ret;
Signed-off-by: Tapasweni Pathak <tapaswenipathak@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtl8712/rtl871x_mp.c')
-rw-r--r-- | drivers/staging/rtl8712/rtl871x_mp.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/staging/rtl8712/rtl871x_mp.c b/drivers/staging/rtl8712/rtl871x_mp.c index 1aaa73f7c4ca..48a6abfa6229 100644 --- a/drivers/staging/rtl8712/rtl871x_mp.c +++ b/drivers/staging/rtl8712/rtl871x_mp.c @@ -186,14 +186,12 @@ u8 r8712_bb_reg_write(struct _adapter *pAdapter, u16 offset, u32 value) u32 r8712_rf_reg_read(struct _adapter *pAdapter, u8 path, u8 offset) { u16 rf_addr = (path << 8) | offset; - u32 rf_data; struct IOCMD_STRUCT iocmd; iocmd.cmdclass = IOCMD_CLASS_BB_RF; iocmd.value = rf_addr; iocmd.index = IOCMD_RF_READ_IDX; - rf_data = fw_iocmd_read(pAdapter, iocmd); - return rf_data; + return fw_iocmd_read(pAdapter, iocmd); } u8 r8712_rf_reg_write(struct _adapter *pAdapter, u8 path, u8 offset, u32 value) @@ -504,11 +502,8 @@ static void TriggerRFThermalMeter(struct _adapter *pAdapter) static u32 ReadRFThermalMeter(struct _adapter *pAdapter) { - u32 ThermalValue = 0; - /* 0x24: RF Reg[4:0] */ - ThermalValue = get_rf_reg(pAdapter, RF_PATH_A, RF_T_METER, 0x1F); - return ThermalValue; + return get_rf_reg(pAdapter, RF_PATH_A, RF_T_METER, 0x1F); } void r8712_GetThermalMeter(struct _adapter *pAdapter, u32 *value) |