From: "Arend van Spriel" <arend@broadcom.com>
To: gregkh@suse.de
Cc: "Arend van Spriel" <arend@broadcom.com>,
devel@linuxdriverproject.org, linux-wireless@vger.kernel.org
Subject: [PATCH 07/29] staging: brcm80211: remove wl_alloc_dma_resources() function
Date: Fri, 22 Jul 2011 20:56:54 +0200 [thread overview]
Message-ID: <1311361036-3175-8-git-send-email-arend@broadcom.com> (raw)
In-Reply-To: <1311361036-3175-1-git-send-email-arend@broadcom.com>
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.
Cc: devel@linuxdriverproject.org
Cc: linux-wireless@vger.kernel.org
Reviewed-by: Henry Ptasinski <henryp@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
---
drivers/staging/brcm80211/brcmsmac/mac80211_if.c | 8 --------
drivers/staging/brcm80211/brcmsmac/mac80211_if.h | 1 -
drivers/staging/brcm80211/brcmsmac/main.c | 6 ------
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 6439fd9..a708306 100644
--- a/drivers/staging/brcm80211/brcmsmac/mac80211_if.c
+++ b/drivers/staging/brcm80211/brcmsmac/mac80211_if.c
@@ -1443,14 +1443,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 0e6b9ca..847e1ab 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)
--
1.7.4.1
next prev parent reply other threads:[~2011-07-22 18:57 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-22 18:56 [PATCH 00/29] staging: brcm80211: cleanup checkpatch warnings Arend van Spriel
2011-07-22 18:56 ` [PATCH 01/29] staging: brcm80211: fixed checkpatch warnings for fullmac Arend van Spriel
2011-07-22 18:56 ` [PATCH 02/29] staging: brcm80211: fixed checkpatch warnings for brcmutil dir Arend van Spriel
2011-07-22 18:56 ` [PATCH 03/29] staging: brcm80211: fixed checkpatch warnings for 'include' dir Arend van Spriel
2011-07-22 18:56 ` [PATCH 04/29] staging: brcm80211: use PCI_DEVICE() macro in device table Arend van Spriel
2011-07-22 18:56 ` [PATCH 05/29] staging: brcm80211: remove unused rx status definitions Arend van Spriel
2011-07-22 18:56 ` [PATCH 06/29] staging: brcm80211: reformat long lines in brcmsmac to 80 columns Arend van Spriel
2011-07-22 18:56 ` Arend van Spriel [this message]
2011-07-22 18:56 ` [PATCH 09/29] staging: brcm80211: remove code for unsupported chip Arend van Spriel
2011-07-26 8:12 ` Dan Carpenter
2011-07-22 18:56 ` [PATCH 10/29] staging: brcm80211: cleaned up softmac DMA layer Arend van Spriel
2011-07-22 18:56 ` [PATCH 11/29] staging: brcm80211: removed void * from softmac phy Arend van Spriel
2011-07-22 18:56 ` [PATCH 12/29] staging: brcm80211: simplified register access macro's in softmac Arend van Spriel
2011-07-22 18:57 ` [PATCH 13/29] staging: brcm80211: revisited END_FOREACH_BSS macro Arend van Spriel
2011-07-26 8:26 ` Dan Carpenter
2011-07-26 16:34 ` Joe Perches
2011-07-22 18:57 ` [PATCH 14/29] staging: brcm80211: placed suspend flag in gInstance in brcmfmac Arend van Spriel
2011-07-22 18:57 ` [PATCH 15/29] staging: brcm80211: remove struct brcmf_sdioh_driver from brcmfmac Arend van Spriel
2011-07-22 18:57 ` [PATCH 16/29] staging: brcm80211: remove vendor and device id check " Arend van Spriel
2011-07-22 18:57 ` [PATCH 17/29] staging: brcm80211: remove struct brcmf_sdio_card " Arend van Spriel
2011-07-22 18:57 ` [PATCH 18/29] staging: brcm80211: remove dead code " Arend van Spriel
2011-07-22 18:57 ` [PATCH 19/29] staging: brcm80211: remove dead client interrupt " Arend van Spriel
2011-07-22 18:57 ` [PATCH 20/29] staging: brcm80211: remove function pointer of interrupt isr in brcmfmac Arend van Spriel
2011-07-22 18:57 ` [PATCH 21/29] staging: brcm80211: cleanup to get rid of 'over 80 character' line Arend van Spriel
2011-07-22 18:57 ` [PATCH 22/29] staging: brcm80211: removed unused bus code from softmac Arend van Spriel
2011-07-22 18:57 ` [PATCH 23/29] staging: brcm80211: replaced void *btparam into struct pci_dev *btparam Arend van Spriel
2011-07-22 18:57 ` [PATCH 24/29] staging: brcm80211: removed void * from ai_ functions Arend van Spriel
2011-07-22 18:57 ` [PATCH 25/29] staging: brcm80211: removed brcms_c_module_unregister() call in ampdu.c Arend van Spriel
2011-07-22 18:57 ` [PATCH 26/29] staging: brcm80211: removed watchdog function from softmac Arend van Spriel
2011-07-22 18:57 ` [PATCH 27/29] staging: brcm80211: SPARC build error fix Arend van Spriel
2011-07-22 18:57 ` [PATCH 28/29] staging: brcm80211: remove target platform limitations for drivers Arend van Spriel
2011-07-22 18:57 ` [PATCH 29/29] staging: brcm80211: updated TODO file Arend van Spriel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1311361036-3175-8-git-send-email-arend@broadcom.com \
--to=arend@broadcom.com \
--cc=devel@linuxdriverproject.org \
--cc=gregkh@suse.de \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).