mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-05 18:39:59 +00:00
Code Issues Releases Wiki Activity

staging: vt6655: remove typedef void *TimerFunction

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

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Malcolm Priestley 2014-10-29 17:56:02 +00:00 committed by Greg Kroah-Hartman
parent dd46cf735d
commit e11cdc39f3
4 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/staging/vt6655/baseband.c
View file

@ -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");

4
drivers/staging/vt6655/baseband.h
View file

@ -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,

6
drivers/staging/vt6655/device_main.c
View file

@ -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);
}

1
drivers/staging/vt6655/wmgr.h
View file

@ -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__