summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArend van Spriel <arend@broadcom.com>2011-08-08 15:58:44 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2011-08-23 13:00:07 -0700
commit76890e69baa3956c3faf170479027a92d74cbf91 (patch)
treeb93be75cee8dfa3016772bb869ba0a5770bcebd1
parent419ad34e819cd90056eea8bb5de63c338fbbc3bd (diff)
downloadop-kernel-dev-76890e69baa3956c3faf170479027a92d74cbf91.zip
op-kernel-dev-76890e69baa3956c3faf170479027a92d74cbf91.tar.gz
staging: brcm80211: remove wl_alloc_dma_resources() function
The function wl_alloc_dma_resources() does not provide any value for the brcmsmac driver as it only returns true. It has been removed from the driver. Reviewed-by: Henry Ptasinski <henryp@broadcom.com> Reviewed-by: Roland Vossen <rvossen@broadcom.com> Signed-off-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/brcm80211/brcmsmac/mac80211_if.c8
-rw-r--r--drivers/staging/brcm80211/brcmsmac/mac80211_if.h1
-rw-r--r--drivers/staging/brcm80211/brcmsmac/main.c6
3 files changed, 0 insertions, 15 deletions
diff --git a/drivers/staging/brcm80211/brcmsmac/mac80211_if.c b/drivers/staging/brcm80211/brcmsmac/mac80211_if.c
index 0af6041..c66b67f 100644
--- a/drivers/staging/brcm80211/brcmsmac/mac80211_if.c
+++ b/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/drivers/staging/brcm80211/brcmsmac/mac80211_if.h b/drivers/staging/brcm80211/brcmsmac/mac80211_if.h
index 0d91366..01fce54 100644
--- a/drivers/staging/brcm80211/brcmsmac/mac80211_if.h
+++ b/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/drivers/staging/brcm80211/brcmsmac/main.c b/drivers/staging/brcm80211/brcmsmac/main.c
index d1a8388..d2551e9 100644
--- a/drivers/staging/brcm80211/brcmsmac/main.c
+++ b/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)
OpenPOWER on IntegriCloud