diff options
| author | Malcolm Priestley <tvboxspy@gmail.com> | 2014-10-29 17:56:02 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-10-29 13:34:47 -0700 |
| commit | e11cdc39f381e541fbdc2eccf2c4fce910a4f2bb (patch) | |
| tree | e07e03f57b64c57cc2562a8529dcb927301c0606 /drivers/staging | |
| parent | dd46cf735d3c95c6f5996716e55934ed40ad4d01 (diff) | |
| download | op-kernel-dev-e11cdc39f381e541fbdc2eccf2c4fce910a4f2bb.zip op-kernel-dev-e11cdc39f381e541fbdc2eccf2c4fce910a4f2bb.tar.gz | |
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: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/vt6655/baseband.c | 8 | ||||
| -rw-r--r-- | drivers/staging/vt6655/baseband.h | 4 | ||||
| -rw-r--r-- | drivers/staging/vt6655/device_main.c | 6 | ||||
| -rw-r--r-- | drivers/staging/vt6655/wmgr.h | 1 |
4 files changed, 9 insertions, 10 deletions
diff --git a/drivers/staging/vt6655/baseband.c b/drivers/staging/vt6655/baseband.c index ed78505..b04dfd9 100644 --- a/drivers/staging/vt6655/baseband.c +++ b/drivers/staging/vt6655/baseband.c @@ -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"); diff --git a/drivers/staging/vt6655/baseband.h b/drivers/staging/vt6655/baseband.h index 2d7a3e2..772ea0d 100644 --- a/drivers/staging/vt6655/baseband.h +++ b/drivers/staging/vt6655/baseband.h @@ -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, diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index 7892f86..5c91c2f 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -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); } diff --git a/drivers/staging/vt6655/wmgr.h b/drivers/staging/vt6655/wmgr.h index 8f9748b..74f1f16 100644 --- a/drivers/staging/vt6655/wmgr.h +++ b/drivers/staging/vt6655/wmgr.h @@ -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__ |
