From: Arend van Spriel Date: Wed, 29 Jun 2011 23:47:30 +0000 (-0700) Subject: staging: brcm80211: remove DHD_SCHED macro definition X-Git-Tag: MMI-PSA29.97-13-9~18845^2~285 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9922af4bc2b7820c5a7ebd7e1823b4b4dcc720da;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git staging: brcm80211: remove DHD_SCHED macro definition The fullmac driver now always uses scheduler functionality. Signed-off-by: Arend van Spriel Reviewed-by: Roland Vossen Reviewed-by: Franky Lin Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/brcm80211/brcmfmac/Makefile b/drivers/staging/brcm80211/brcmfmac/Makefile index 0674a6ab3792..1444fd4b3eda 100644 --- a/drivers/staging/brcm80211/brcmfmac/Makefile +++ b/drivers/staging/brcm80211/brcmfmac/Makefile @@ -19,7 +19,6 @@ ccflags-y := \ -DBCMSDIO \ -DBRCM_FULLMAC \ -DBRCMF_FIRSTREAD=64 \ - -DDHD_SCHED \ -DBRCMF_SDALIGN=64 \ -DEMBEDDED_PLATFORM \ -DMAX_HDR_READ=64 \ diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c index c3a0e94d9c7d..593d1800fb55 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c @@ -1201,14 +1201,12 @@ static int brcmf_watchdog_thread(void *data) /* This thread doesn't need any user-level access, * so get rid of all our resources */ -#ifdef DHD_SCHED if (brcmf_watchdog_prio > 0) { struct sched_param param; param.sched_priority = (brcmf_watchdog_prio < MAX_RT_PRIO) ? brcmf_watchdog_prio : (MAX_RT_PRIO - 1); sched_setscheduler(current, SCHED_FIFO, ¶m); } -#endif /* DHD_SCHED */ allow_signal(SIGTERM); /* Run until signal received */ @@ -1261,7 +1259,6 @@ static int brcmf_dpc_thread(void *data) /* This thread doesn't need any user-level access, * so get rid of all our resources */ -#ifdef DHD_SCHED if (brcmf_dpc_prio > 0) { struct sched_param param; param.sched_priority = @@ -1269,7 +1266,6 @@ static int brcmf_dpc_thread(void *data) MAX_RT_PRIO) ? brcmf_dpc_prio : (MAX_RT_PRIO - 1); sched_setscheduler(current, SCHED_FIFO, ¶m); } -#endif /* DHD_SCHED */ allow_signal(SIGTERM); /* Run until signal received */