Commit dd68e1b4 authored by Pekka Enberg's avatar Pekka Enberg Committed by Greg Kroah-Hartman
Browse files

Staging: w35und: merge rest of wbhal.c to phy_calibration.c 



Impact: cleanup

The remaining functions are local to phy_calibration.c so move them
there and remove wbhal.c.

Acked-by: default avatarPavel Machek <pavel@ucw.cz>
Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 40abfccb

drivers/staging/winbond/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ w35und-objs := \ 
	wb35reg.o		\

	wb35rx.o		\

	wb35tx.o		\

	wbhal.o			\

	wbusb.o			\

drivers/staging/winbond/phy_calibration.c

+19 −0
Original line number Diff line number Diff line
@@ -340,6 +340,25 @@ void _sin_cos(s32 angle, s32 *sin, s32 *cos) 
    }

}



static unsigned char hal_get_dxx_reg(struct hw_data *pHwData, u16 number, u32 * pValue)

{

	if (number < 0x1000)

		number += 0x1000;

	return Wb35Reg_ReadSync(pHwData, number, pValue);

}

#define hw_get_dxx_reg( _A, _B, _C ) hal_get_dxx_reg( _A, _B, (u32 *)_C )



static unsigned char hal_set_dxx_reg(struct hw_data *pHwData, u16 number, u32 value)

{

	unsigned char ret;



	if (number < 0x1000)

		number += 0x1000;

	ret = Wb35Reg_WriteSync(pHwData, number, value);

	return ret;

}

#define hw_set_dxx_reg( _A, _B, _C ) hal_set_dxx_reg( _A, _B, (u32)_C )





void _reset_rx_cal(struct hw_data *phw_data)

{

drivers/staging/winbond/wbhal.c

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
#include "sysdef.h"

#include "wbhal_f.h"

#include "wblinux_f.h"



unsigned char hal_get_dxx_reg(struct hw_data *pHwData, u16 number, u32 * pValue)

{

	if (number < 0x1000)

		number += 0x1000;

	return Wb35Reg_ReadSync(pHwData, number, pValue);

}



unsigned char hal_set_dxx_reg(struct hw_data *pHwData, u16 number, u32 value)

{

	unsigned char ret;



	if (number < 0x1000)

		number += 0x1000;

	ret = Wb35Reg_WriteSync(pHwData, number, value);

	return ret;

}

drivers/staging/winbond/wbhal_f.h

+0 −4
Original line number Diff line number Diff line
@@ -52,8 +52,6 @@ u32 hal_get_bss_pk_cnt( struct hw_data * pHwData ); 


#define PHY_DEBUG( msg, args... )



unsigned char hal_get_dxx_reg(  struct hw_data * pHwData,  u16 number,  u32 * pValue );

unsigned char hal_set_dxx_reg(  struct hw_data * pHwData,  u16 number,  u32 value );

#define hal_get_time_count( _P )	(_P->time_count/10)	// return 100ms count

#define hal_detect_error( _P )		(_P->WbUsb.DetectCount)
@@ -68,7 +66,5 @@ unsigned char hal_set_dxx_reg( struct hw_data * pHwData, u16 number, u32 valu 
#define hal_join_request_stop(_A)

#define hw_get_cxx_reg( _A, _B, _C )

#define hw_set_cxx_reg( _A, _B, _C )

#define hw_get_dxx_reg( _A, _B, _C )	hal_get_dxx_reg( _A, _B, (u32 *)_C )

#define hw_set_dxx_reg( _A, _B, _C )	hal_set_dxx_reg( _A, _B, (u32)_C )