From e95c578ff0cb4e8667811abde6c8aafc151d50c9 Mon Sep 17 00:00:00 2001
From: Arend van Spriel <arend@broadcom.com>
Date: Mon, 8 Aug 2011 15:58:44 +0200
Subject: [PATCH] --- yaml --- r: 267447 b: refs/heads/master c:
 76890e69baa3956c3faf170479027a92d74cbf91 h: refs/heads/master i:   267445:
 5f23c2c75a1776455a9d71029cbed5f0c4c45e12   267443:
 5940e6ced11b19a6df3627ba336a0cd2a1a7450b   267439:
 51ae335f22c3622a1cdee1b40e5a84923cb910f4 v: v3

---
 [refs]                                                 | 2 +-
 trunk/drivers/staging/brcm80211/brcmsmac/mac80211_if.c | 8 --------
 trunk/drivers/staging/brcm80211/brcmsmac/mac80211_if.h | 1 -
 trunk/drivers/staging/brcm80211/brcmsmac/main.c        | 6 ------
 4 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index 87e86a709ac8..f25bd2b2772c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 419ad34e819cd90056eea8bb5de63c338fbbc3bd
+refs/heads/master: 76890e69baa3956c3faf170479027a92d74cbf91
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/mac80211_if.c b/trunk/drivers/staging/brcm80211/brcmsmac/mac80211_if.c
index 0af60414d9ee..c66b67f900f4 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/mac80211_if.c
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/mac80211_if.c
@@ -1444,14 +1444,6 @@ void brcms_intrson(struct brcms_info *wl)
 	INT_UNLOCK(wl, flags);
 }
 
-/*
- * precondition: perimeter lock has been acquired
- */
-bool wl_alloc_dma_resources(struct brcms_info *wl, uint addrwidth)
-{
-	return true;
-}
-
 u32 brcms_intrsoff(struct brcms_info *wl)
 {
 	unsigned long flags;
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/mac80211_if.h b/trunk/drivers/staging/brcm80211/brcmsmac/mac80211_if.h
index 0d913664355f..01fce542f23a 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/mac80211_if.h
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/mac80211_if.h
@@ -87,7 +87,6 @@ extern int brcms_up(struct brcms_info *wl);
 extern void brcms_down(struct brcms_info *wl);
 extern void brcms_txflowcontrol(struct brcms_info *wl, struct brcms_if *wlif,
 				bool state, int prio);
-extern bool wl_alloc_dma_resources(struct brcms_info *wl, uint dmaddrwidth);
 extern bool brcms_rfkill_set_hw_state(struct brcms_info *wl);
 
 /* timer functions */
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/main.c b/trunk/drivers/staging/brcm80211/brcmsmac/main.c
index d1a8388073a6..d2551e970e58 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/main.c
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/main.c
@@ -870,12 +870,6 @@ static bool brcms_b_attach_dmapio(struct brcms_c_info *wlc, uint j, bool wme)
 		addrwidth =
 		    dma_addrwidth(wlc_hw->sih, DMAREG(wlc_hw, DMA_TX, 0));
 
-		if (!wl_alloc_dma_resources(wlc_hw->wlc->wl, addrwidth)) {
-			wiphy_err(wiphy, "wl%d: wlc_attach: alloc_dma_"
-				  "resources failed\n", unit);
-			return false;
-		}
-
 		/*
 		 * FIFO 0
 		 * TX: TX_AC_BK_FIFO (TX AC Background data packets)