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>

diff --git a/drivers/staging/brcm80211/brcmfmac/Makefile b/drivers/staging/brcm80211/brcmfmac/Makefile
index 0674a6ab37921ad3fd0deb69c8eae6260a7487b2..1444fd4b3eda51a5bb01b6297a8dff24cae5cac9 100644 (file)
--- 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 c3a0e94d9c7dbb13d48cb6ab9f4cd82d5087e02b..593d1800fb55d83af743647c55819b24beb3be6e 100644 (file)
--- 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 */