Commit e11cdc39 authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files

staging: vt6655: remove typedef void *TimerFunction 



Covert functions TimerSQ3CallBack and TimerState1CallBack to
the correct type for struct timer_list.function to remove
the cast altogether.

Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent dd46cf73

drivers/staging/vt6655/baseband.c

+4 −4
Original line number Diff line number Diff line
@@ -2781,10 +2781,10 @@ void BBvAntennaDiversity(struct vnt_private *pDevice, 


void

TimerSQ3CallBack(

	void *hDeviceContext

	unsigned long data

)

{

	struct vnt_private *pDevice = hDeviceContext;

	struct vnt_private *pDevice = (struct vnt_private *)data;

	unsigned long flags;



	pr_debug("TimerSQ3CallBack...\n");
@@ -2827,10 +2827,10 @@ TimerSQ3CallBack( 


void

TimerState1CallBack(

	void *hDeviceContext

	unsigned long data

)

{

	struct vnt_private *pDevice = hDeviceContext;

	struct vnt_private *pDevice = (struct vnt_private *)data;

	unsigned long flags;



	pr_debug("TimerState1CallBack...\n");

drivers/staging/vt6655/baseband.h

+2 −2
Original line number Diff line number Diff line
@@ -103,12 +103,12 @@ void BBvExitDeepSleep(void __iomem *dwIoBase, unsigned char byLocalID); 


void

TimerSQ3CallBack(

	void *hDeviceContext

	unsigned long

);



void

TimerState1CallBack(

	void *hDeviceContext

	unsigned long

);



void BBvAntennaDiversity(struct vnt_private *pDevice,

drivers/staging/vt6655/device_main.c

+3 −3
Original line number Diff line number Diff line
@@ -625,17 +625,17 @@ static void device_init_diversity_timer(struct vnt_private *pDevice) 
{

	init_timer(&pDevice->TimerSQ3Tmax1);

	pDevice->TimerSQ3Tmax1.data = (unsigned long) pDevice;

	pDevice->TimerSQ3Tmax1.function = (TimerFunction)TimerSQ3CallBack;

	pDevice->TimerSQ3Tmax1.function = TimerSQ3CallBack;

	pDevice->TimerSQ3Tmax1.expires = RUN_AT(HZ);



	init_timer(&pDevice->TimerSQ3Tmax2);

	pDevice->TimerSQ3Tmax2.data = (unsigned long) pDevice;

	pDevice->TimerSQ3Tmax2.function = (TimerFunction)TimerSQ3CallBack;

	pDevice->TimerSQ3Tmax2.function = TimerSQ3CallBack;

	pDevice->TimerSQ3Tmax2.expires = RUN_AT(HZ);



	init_timer(&pDevice->TimerSQ3Tmax3);

	pDevice->TimerSQ3Tmax3.data = (unsigned long) pDevice;

	pDevice->TimerSQ3Tmax3.function = (TimerFunction)TimerState1CallBack;

	pDevice->TimerSQ3Tmax3.function = TimerState1CallBack;

	pDevice->TimerSQ3Tmax3.expires = RUN_AT(HZ);

}

drivers/staging/vt6655/wmgr.h

+0 −1
Original line number Diff line number Diff line
@@ -72,6 +72,5 @@ 


/*---------------------  Export Types  ------------------------------*/

#define timer_expire(timer, next_tick)   mod_timer(&timer, RUN_AT(next_tick))

typedef void (*TimerFunction)(unsigned long);



#endif // __WMGR_H__

CRA Git | Maintained and supported by SUSTech CRA and CCSE