From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu, 7 Oct 2010 23:11:01 +0000 (-0700)
Subject: Staging: brcm80211: remove MY_INIT_WORK macro
X-Git-Tag: upstream/snapshot3+hdmi~12602^2~3^2~291
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=364eb72a3965ddf3291be74562081b1c19813473;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

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: Greg Kroah-Hartman <gregkh@suse.de>
---

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 <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>
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)) {