Skip to content

Commit

Permalink
staging: vt6656: code cleanup, removed HANDLE definition in ttype.h
Browse files Browse the repository at this point in the history
Checkpatch warnings about using externs in .c files were not resolved,
neither some long lines on deeply nested code.

Signed-off-by: Andres More <more.andres@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Andres More authored and Greg Kroah-Hartman committed May 11, 2010
1 parent 3afc7cc commit 0cbd8d9
Show file tree
Hide file tree
Showing 18 changed files with 506 additions and 781 deletions.
22 changes: 10 additions & 12 deletions drivers/staging/vt6656/baseband.c
Original file line number Diff line number Diff line change
Expand Up @@ -1513,7 +1513,9 @@ BBvAntennaDiversity (PSDevice pDevice, BYTE byRxRate, BYTE bySQ3)
if ( pDevice->byTMax == 0 )
return;

bScheduleCommand((HANDLE) pDevice, WLAN_CMD_CHANGE_ANTENNA, NULL);
bScheduleCommand((void *) pDevice,
WLAN_CMD_CHANGE_ANTENNA,
NULL);

pDevice->byAntennaState = 1;

Expand Down Expand Up @@ -1543,7 +1545,9 @@ BBvAntennaDiversity (PSDevice pDevice, BYTE byRxRate, BYTE bySQ3)
((pDevice->ulSQ3_State1 != 0) && (pDevice->ulSQ3_State0 != 0) && (pDevice->ulSQ3_State0 < pDevice->ulSQ3_State1))
) {

bScheduleCommand((HANDLE) pDevice, WLAN_CMD_CHANGE_ANTENNA, NULL);
bScheduleCommand((void *) pDevice,
WLAN_CMD_CHANGE_ANTENNA,
NULL);

pDevice->TimerSQ3Tmax3.expires = RUN_AT(pDevice->byTMax3 * HZ);
pDevice->TimerSQ3Tmax2.expires = RUN_AT(pDevice->byTMax2 * HZ);
Expand Down Expand Up @@ -1576,17 +1580,14 @@ BBvAntennaDiversity (PSDevice pDevice, BYTE byRxRate, BYTE bySQ3)
*
-*/

void
TimerSQ3CallBack (
HANDLE hDeviceContext
)
void TimerSQ3CallBack(void *hDeviceContext)
{
PSDevice pDevice = (PSDevice)hDeviceContext;

DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"TimerSQ3CallBack...");
spin_lock_irq(&pDevice->lock);

bScheduleCommand((HANDLE) pDevice, WLAN_CMD_CHANGE_ANTENNA, NULL);
bScheduleCommand((void *) pDevice, WLAN_CMD_CHANGE_ANTENNA, NULL);
pDevice->byAntennaState = 0;
s_vClearSQ3Value(pDevice);
pDevice->TimerSQ3Tmax3.expires = RUN_AT(pDevice->byTMax3 * HZ);
Expand Down Expand Up @@ -1618,10 +1619,7 @@ TimerSQ3CallBack (
*
-*/

void
TimerSQ3Tmax3CallBack (
HANDLE hDeviceContext
)
void TimerSQ3Tmax3CallBack(void *hDeviceContext)
{
PSDevice pDevice = (PSDevice)hDeviceContext;

Expand All @@ -1639,7 +1637,7 @@ TimerSQ3Tmax3CallBack (
return;
}

bScheduleCommand((HANDLE) pDevice, WLAN_CMD_CHANGE_ANTENNA, NULL);
bScheduleCommand((void *) pDevice, WLAN_CMD_CHANGE_ANTENNA, NULL);
pDevice->byAntennaState = 1;
del_timer(&pDevice->TimerSQ3Tmax3);
del_timer(&pDevice->TimerSQ3Tmax2);
Expand Down
11 changes: 2 additions & 9 deletions drivers/staging/vt6656/baseband.h
Original file line number Diff line number Diff line change
Expand Up @@ -117,15 +117,8 @@ BBvCaculateParameter (

// timer for antenna diversity

void
TimerSQ3CallBack (
HANDLE hDeviceContext
);

void
TimerSQ3Tmax3CallBack (
HANDLE hDeviceContext
);
void TimerSQ3CallBack(void *hDeviceContext);
void TimerSQ3Tmax3CallBack(void *hDeviceContext);

void BBvAntennaDiversity(PSDevice pDevice, BYTE byRxRate, BYTE bySQ3);
void BBvLoopbackOn(PSDevice pDevice);
Expand Down
Loading

0 comments on commit 0cbd8d9

Please sign in to comment.