Commit 15cf23d5 authored by Arend van Spriel's avatar Arend van Spriel Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: remove unnecessary abstraction for scheduler 



The source dhd_linux_sched.c provided function setScheduler, but it
simply calls sched_setscheduler() linux function. The setScheduler()
function has been removed.

Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Reviewed-by: default avatarRoland Vossen <rvossen@broadcom.com>
Reviewed-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 5e92aa8c

drivers/staging/brcm80211/brcmfmac/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ DHDOFILES = \ 
	dhd_custom_gpio.o \

	dhd_sdio.o	\

	dhd_linux.o \

	dhd_linux_sched.o \

	bcmsdh.o \

	bcmsdh_linux.o	\

	bcmsdh_sdmmc.o \

drivers/staging/brcm80211/brcmfmac/dhd.h

+0 −2
Original line number Diff line number Diff line
@@ -938,8 +938,6 @@ extern int write_to_file(dhd_pub_t *dhd, u8 *buf, int size); 
extern int dhd_customer_oob_irq_map(unsigned long *irq_flags_ptr);

#endif				/* defined(OOB_INTR_ONLY) */



int setScheduler(struct task_struct *p, int policy, struct sched_param *param);



extern void dhd_timeout_start(dhd_timeout_t *tmo, uint usec);

extern int dhd_timeout_expired(dhd_timeout_t *tmo);

drivers/staging/brcm80211/brcmfmac/dhd_linux.c

+2 −2
Original line number Diff line number Diff line
@@ -1244,7 +1244,7 @@ static int dhd_watchdog_thread(void *data) 
		struct sched_param param;

		param.sched_priority = (dhd_watchdog_prio < MAX_RT_PRIO) ?

		    dhd_watchdog_prio : (MAX_RT_PRIO - 1);

		setScheduler(current, SCHED_FIFO, &param);

		sched_setscheduler(current, SCHED_FIFO, &param);

	}

#endif				/* DHD_SCHED */
@@ -1305,7 +1305,7 @@ static int dhd_dpc_thread(void *data) 
		param.sched_priority =

		    (dhd_dpc_prio <

		     MAX_RT_PRIO) ? dhd_dpc_prio : (MAX_RT_PRIO - 1);

		setScheduler(current, SCHED_FIFO, &param);

		sched_setscheduler(current, SCHED_FIFO, &param);

	}

#endif				/* DHD_SCHED */

drivers/staging/brcm80211/brcmfmac/dhd_linux_sched.c

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2010 Broadcom Corporation

 *

 * Permission to use, copy, modify, and/or distribute this software for any

 * purpose with or without fee is hereby granted, provided that the above

 * copyright notice and this permission notice appear in all copies.

 *

 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES

 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY

 * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION

 * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN

 * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 */

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/sched.h>



int setScheduler(struct task_struct *p, int policy, struct sched_param *param)

{

	int rc = 0;

	rc = sched_setscheduler(p, policy, param);

	return rc;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE