From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu, 7 Oct 2010 23:28:15 +0000 (-0700)
Subject: Staging: brcm80211: remove unneeded pm macro
X-Git-Tag: v2.6.37-rc1~60^2~3^2~286
X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=878a667394501e03cd27b393b87cf472fa74122c;p=net-next-2.6.git

Staging: brcm80211: remove unneeded pm macro

Use the real type, not a macro.

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 921cf66636f..a2b082fad26 100644
--- a/drivers/staging/brcm80211/include/linuxver.h
+++ b/drivers/staging/brcm80211/include/linuxver.h
@@ -39,9 +39,6 @@ typedef irqreturn_t(*FN_ISR) (int irq, void *dev_id, struct pt_regs * ptregs);
 #include <linux/sched.h>
 #include <linux/ieee80211.h>
 
-/* suspend args */
-#define DRV_SUSPEND_STATE_TYPE pm_message_t
-
 #define CHECKSUM_HW	CHECKSUM_PARTIAL
 
 #include <linux/time.h>
diff --git a/drivers/staging/brcm80211/sys/wl_mac80211.c b/drivers/staging/brcm80211/sys/wl_mac80211.c
index a2e5feb8aa9..2360815a49d 100644
--- a/drivers/staging/brcm80211/sys/wl_mac80211.c
+++ b/drivers/staging/brcm80211/sys/wl_mac80211.c
@@ -1359,7 +1359,7 @@ wl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 }
 
 #ifdef LINUXSTA_PS
-static int wl_suspend(struct pci_dev *pdev, DRV_SUSPEND_STATE_TYPE state)
+static int wl_suspend(struct pci_dev *pdev, pm_message_t state)
 {
 	wl_info_t *wl;
 	struct ieee80211_hw *hw;