Re: [PATCH 1/7] w35und: Kill dead HAL macros in wbhal_f.h

[Pavel Machek <pavel@ucw.cz>]

Hi!

> Fixes an uninitialized variable access in _rx_iq_calibration_loop_winbond():
> 
>     CC [M]  drivers/staging/winbond/phy_calibration.o
>   drivers/staging/winbond/phy_calibration.c: In function ???_rx_iq_calibration_loop_winbond???:
>   drivers/staging/winbond/phy_calibration.c:1138: warning: ???val??? is used uninitialized in this function
> 

Aha, I should have read the description.

> Cc: Pavel Machek <pavel@ucw.cz>
> Cc: Ruslan Pisarev <ruslan@rpisarev.org.ua>
> Signed-off-by: Pekka Enberg <penberg@kernel.org>
> ---
>  drivers/staging/winbond/phy_calibration.c |   20 --------------------
>  drivers/staging/winbond/wbhal_f.h         |   10 ----------
>  2 files changed, 0 insertions(+), 30 deletions(-)
> 
> diff --git a/drivers/staging/winbond/phy_calibration.c b/drivers/staging/winbond/phy_calibration.c
> index 5c1f053..2b375ba 100644
> --- a/drivers/staging/winbond/phy_calibration.c
> +++ b/drivers/staging/winbond/phy_calibration.c
> @@ -1132,18 +1132,6 @@ u8 _rx_iq_calibration_loop_winbond(struct hw_data *phw_data, u16 factor, u32 fre
>  	PHY_DEBUG(("[CAL] -> [5]_rx_iq_calibration_loop()\n"));
>  	PHY_DEBUG(("[CAL] ** factor = %d\n", factor));
>  
> -
> -/* RF Control Override */
> -	hw_get_cxx_reg(phw_data, 0x80, &val);
> -	val |= BIT(19);
> -	hw_set_cxx_reg(phw_data, 0x80, val);
> -

These are macros that do nothing. ACK the patch.

							Pavel


> --- a/drivers/staging/winbond/wbhal_f.h
> +++ b/drivers/staging/winbond/wbhal_f.h
> @@ -78,14 +78,4 @@ u32 hal_get_bss_pk_cnt(struct hw_data *hw_data);
>  #define hal_get_time_count(_P)		(_P->time_count / 10)
>  #define hal_detect_error(_P)		(_P->WbUsb.DetectCount)
>  
> -/* The follow function is unused for IS89C35 */
> -#define hal_disable_interrupt(_A)
> -#define hal_enable_interrupt(_A)
> -#define hal_get_interrupt_type(_A)
> -#define hal_get_clear_interrupt(_A)
>  #define hal_ibss_disconnect(_A)		(hal_stop_sync_bss(_A))
> -#define hal_join_request_stop(_A)
> -#define hw_get_cxx_reg(_A, _B, _C)
> -#define hw_set_cxx_reg(_A, _B, _C)
> -
> -

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html