From 364eb72a3965ddf3291be74562081b1c19813473 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 7 Oct 2010 16:11:01 -0700 Subject: [PATCH] Staging: brcm80211: remove MY_INIT_WORK macro Use the real macro instead. Cc: Brett Rudley Cc: Henry Ptasinski Cc: Nohee Ko Signed-off-by: Greg Kroah-Hartman --- drivers/staging/brcm80211/include/linuxver.h | 2 -- drivers/staging/brcm80211/sys/wl_mac80211.c | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/staging/brcm80211/include/linuxver.h b/drivers/staging/brcm80211/include/linuxver.h index 98768d3..0f8d8af 100644 --- a/drivers/staging/brcm80211/include/linuxver.h +++ b/drivers/staging/brcm80211/include/linuxver.h @@ -34,8 +34,6 @@ #include -#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 diff --git a/drivers/staging/brcm80211/sys/wl_mac80211.c b/drivers/staging/brcm80211/sys/wl_mac80211.c index 98d3e84..88c34fe 100644 --- a/drivers/staging/brcm80211/sys/wl_mac80211.c +++ b/drivers/staging/brcm80211/sys/wl_mac80211.c @@ -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)) { -- 2.7.4