summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArend van Spriel <arend@broadcom.com>2011-06-29 23:47:30 (GMT)
committerGreg Kroah-Hartman <gregkh@suse.de>2011-07-05 16:57:20 (GMT)
commit9922af4bc2b7820c5a7ebd7e1823b4b4dcc720da (patch)
treed99822f867307420dda312c0e6f90d8a0a7df7bc
parente0d319f5c7d59756d27f29bd40ea539c090a7c98 (diff)
downloadlinux-9922af4bc2b7820c5a7ebd7e1823b4b4dcc720da.tar.xz
staging: brcm80211: remove DHD_SCHED macro definition
The fullmac driver now always uses scheduler functionality. Signed-off-by: Arend van Spriel <arend@broadcom.com> Reviewed-by: Roland Vossen <rvossen@broadcom.com> Reviewed-by: Franky Lin <frankyl@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/brcm80211/brcmfmac/Makefile1
-rw-r--r--drivers/staging/brcm80211/brcmfmac/dhd_linux.c4
2 files changed, 0 insertions, 5 deletions
diff --git a/drivers/staging/brcm80211/brcmfmac/Makefile b/drivers/staging/brcm80211/brcmfmac/Makefile
index 0674a6a..1444fd4 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 c3a0e94..593d180 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, &param);
}
-#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, &param);
}
-#endif /* DHD_SCHED */
allow_signal(SIGTERM);
/* Run until signal received */