diff --git a/drivers/staging/rtl8712/rtl8712_io.c b/drivers/staging/rtl8712/rtl8712_io.c index c7346008def0..c84aeb9940bc 100644 --- a/drivers/staging/rtl8712/rtl8712_io.c +++ b/drivers/staging/rtl8712/rtl8712_io.c @@ -39,11 +39,9 @@ u8 r8712_read8(struct _adapter *adapter, u32 addr) struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; struct intf_hdl *pintfhdl = &(pio_queue->intf); u8 (*_read8)(struct intf_hdl *pintfhdl, u32 addr); - u8 r_val; _read8 = pintfhdl->io_ops._read8; - r_val = _read8(pintfhdl, addr); - return r_val; + return _read8(pintfhdl, addr); } u16 r8712_read16(struct _adapter *adapter, u32 addr) @@ -51,11 +49,9 @@ u16 r8712_read16(struct _adapter *adapter, u32 addr) struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; struct intf_hdl *pintfhdl = &(pio_queue->intf); u16 (*_read16)(struct intf_hdl *pintfhdl, u32 addr); - u16 r_val; _read16 = pintfhdl->io_ops._read16; - r_val = _read16(pintfhdl, addr); - return r_val; + return _read16(pintfhdl, addr); } u32 r8712_read32(struct _adapter *adapter, u32 addr) @@ -63,11 +59,9 @@ u32 r8712_read32(struct _adapter *adapter, u32 addr) struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; struct intf_hdl *pintfhdl = &(pio_queue->intf); u32 (*_read32)(struct intf_hdl *pintfhdl, u32 addr); - u32 r_val; _read32 = pintfhdl->io_ops._read32; - r_val = _read32(pintfhdl, addr); - return r_val; + return _read32(pintfhdl, addr); } void r8712_write8(struct _adapter *adapter, u32 addr, u8 val) 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)