Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 364eb72a authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Staging: brcm80211: remove MY_INIT_WORK macro 



Use the real macro instead.

Cc: Brett Rudley <brudley@broadcom.com>
Cc: Henry Ptasinski <henryp@broadcom.com>
Cc: Nohee Ko <noheek@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent fff41b2e

drivers/staging/brcm80211/include/linuxver.h

+0 −2
Original line number Diff line number Diff line
@@ -34,8 +34,6 @@ 


#include <linux/workqueue.h>



#define	MY_INIT_WORK(_work, _func)	INIT_WORK(_work, _func)



typedef irqreturn_t(*FN_ISR) (int irq, void *dev_id, struct pt_regs * ptregs);



#include <linux/sched.h>

drivers/staging/brcm80211/sys/wl_mac80211.c

+2 −2
Original line number Diff line number Diff line
@@ -831,7 +831,7 @@ static wl_info_t *wl_attach(uint16 vendor, uint16 device, unsigned long regs, 
	}



	/* init tx work queue for wl_start/send pkt; no need to destroy workitem  */

	MY_INIT_WORK(&wl->txq_task.work, (work_func_t) wl_start_txqwork);

	INIT_WORK(&wl->txq_task.work, (work_func_t) wl_start_txqwork);

	wl->txq_task.context = wl;

#endif				/* WLC_HIGH_ONLY */
@@ -1670,7 +1670,7 @@ wl_schedule_task(wl_info_t *wl, void (*fn) (struct wl_task *task), 
		return -ENOMEM;

	}



	MY_INIT_WORK(&task->work, (work_func_t) fn);

	INIT_WORK(&task->work, (work_func_t) fn);

	task->context = context;



	if (!schedule_work(&task->work)) {