From: "Arend van Spriel" <arend@broadcom.com>
To: gregkh@suse.de
Cc: devel@linuxdriverproject.org, linux-wireless@vger.kernel.org,
"Franky Lin" <frankyl@broadcom.com>,
"Arend van Spriel" <arend@broadcom.com>
Subject: [PATCH 07/14] staging: brcm80211: absorb brcmf_sdioh_interrupt_register into brcmf_sdcard_intr_reg
Date: Fri, 12 Aug 2011 15:34:54 +0200 [thread overview]
Message-ID: <1313156101-16817-8-git-send-email-arend@broadcom.com> (raw)
In-Reply-To: <1313156101-16817-1-git-send-email-arend@broadcom.com>
From: Franky Lin <frankyl@broadcom.com>
brcmfmac wrapper function cleanup
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
---
drivers/staging/brcm80211/brcmfmac/bcmsdh.c | 22 ++++++++++-
drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 43 ---------------------
drivers/staging/brcm80211/brcmfmac/sdio_host.h | 1 -
3 files changed, 21 insertions(+), 45 deletions(-)
diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh.c
index 13b6dbe..e5cf138 100644
--- a/drivers/staging/brcm80211/brcmfmac/bcmsdh.c
+++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh.c
@@ -21,6 +21,7 @@
#include <linux/pci_ids.h>
#include <linux/sched.h>
#include <linux/completion.h>
+#include <linux/mmc/sdio_func.h>
#include <linux/mmc/card.h>
#include <defs.h>
@@ -162,9 +163,28 @@ exit:
return bcmerror;
}
+static void brcmf_sdioh_irqhandler(struct sdio_func *func)
+{
+ struct brcmf_sdio_dev *sdiodev = dev_get_drvdata(&func->card->dev);
+
+ BRCMF_TRACE(("brcmf: ***IRQHandler\n"));
+
+ sdio_release_host(func);
+
+ brcmf_sdbrcm_isr(sdiodev->bus);
+
+ sdio_claim_host(func);
+}
+
int brcmf_sdcard_intr_reg(struct brcmf_sdio_dev *sdiodev)
{
- return brcmf_sdioh_interrupt_register(sdiodev);
+ BRCMF_TRACE(("%s: Entering\n", __func__));
+
+ sdio_claim_host(sdiodev->func[1]);
+ sdio_claim_irq(sdiodev->func[1], brcmf_sdioh_irqhandler);
+ sdio_release_host(sdiodev->func[1]);
+
+ return 0;
}
int brcmf_sdcard_intr_dereg(struct brcmf_sdio_dev *sdiodev)
diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
index 1bfeec6..2e7d3ce 100644
--- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
+++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
@@ -44,8 +44,6 @@
#define SDIO_DEVICE_ID_BROADCOM_4329 0x4329
#endif /* !defined(SDIO_DEVICE_ID_BROADCOM_4329) */
-static void brcmf_sdioh_irqhandler(struct sdio_func *func);
-static void brcmf_sdioh_irqhandler_f2(struct sdio_func *func);
static int brcmf_sdioh_get_cisaddr(struct brcmf_sdio_dev *sdiodev, u32 regaddr);
static int brcmf_ops_sdio_probe(struct sdio_func *func,
const struct sdio_device_id *id);
@@ -192,28 +190,6 @@ void brcmf_sdioh_detach(struct brcmf_sdio_dev *sdiodev)
}
-/* Configure callback to client when we receive client interrupt */
-extern int
-brcmf_sdioh_interrupt_register(struct brcmf_sdio_dev *sdiodev)
-{
- BRCMF_TRACE(("%s: Entering\n", __func__));
-
- /* register and unmask irq */
- if (sdiodev->func[2]) {
- sdio_claim_host(sdiodev->func[2]);
- sdio_claim_irq(sdiodev->func[2], brcmf_sdioh_irqhandler_f2);
- sdio_release_host(sdiodev->func[2]);
- }
-
- if (sdiodev->func[1]) {
- sdio_claim_host(sdiodev->func[1]);
- sdio_claim_irq(sdiodev->func[1], brcmf_sdioh_irqhandler);
- sdio_release_host(sdiodev->func[1]);
- }
-
- return 0;
-}
-
int brcmf_sdioh_interrupt_deregister(struct brcmf_sdio_dev *sdiodev)
{
BRCMF_TRACE(("%s: Entering\n", __func__));
@@ -662,25 +638,6 @@ brcmf_sdioh_card_regread(struct brcmf_sdio_dev *sdiodev, int func, u32 regaddr,
return SUCCESS;
}
-static void brcmf_sdioh_irqhandler(struct sdio_func *func)
-{
- struct brcmf_sdio_dev *sdiodev = dev_get_drvdata(&func->card->dev);
-
- BRCMF_TRACE(("brcmf: ***IRQHandler\n"));
-
- sdio_release_host(func);
-
- brcmf_sdbrcm_isr(sdiodev->bus);
-
- sdio_claim_host(func);
-}
-
-/* interrupt handler for F2 (dummy handler) */
-static void brcmf_sdioh_irqhandler_f2(struct sdio_func *func)
-{
- BRCMF_TRACE(("brcmf: ***IRQHandlerF2\n"));
-}
-
static int brcmf_ops_sdio_probe(struct sdio_func *func,
const struct sdio_device_id *id)
{
diff --git a/drivers/staging/brcm80211/brcmfmac/sdio_host.h b/drivers/staging/brcm80211/brcmfmac/sdio_host.h
index 4a814e5..bdbf411 100644
--- a/drivers/staging/brcm80211/brcmfmac/sdio_host.h
+++ b/drivers/staging/brcm80211/brcmfmac/sdio_host.h
@@ -247,7 +247,6 @@ extern u32 brcmf_sdcard_cur_sbwad(struct brcmf_sdio_dev *sdiodev);
extern int brcmf_sdioh_attach(struct brcmf_sdio_dev *sdiodev);
extern void brcmf_sdioh_detach(struct brcmf_sdio_dev *sdiodev);
-extern int brcmf_sdioh_interrupt_register(struct brcmf_sdio_dev *sdiodev);
extern int brcmf_sdioh_interrupt_deregister(struct brcmf_sdio_dev *sdiodev);
/* read or write one byte using cmd52 */
--
1.7.4.1
next prev parent reply other threads:[~2011-08-12 13:35 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-12 13:34 [PATCH 00/14] staging: brcm80211: brcmfmac driver cleanup Arend van Spriel
2011-08-12 13:34 ` [PATCH 01/14] staging: brcm80211: use wait queues instead of semaphores in wl_cfg80211.c Arend van Spriel
2011-08-12 14:07 ` Rafał Miłecki
2011-08-12 16:44 ` Arend van Spriel
2011-08-12 18:55 ` Arend van Spriel
2011-08-12 18:59 ` Johannes Berg
2011-08-12 18:59 ` Franky Lin
2011-08-12 19:08 ` Larry Finger
2011-08-12 19:10 ` Arend van Spriel
2011-08-16 20:27 ` Rafał Miłecki
2011-08-12 19:05 ` [PATCHv2 " Arend van Spriel
2011-08-12 19:07 ` Arend van Spriel
2011-08-12 19:09 ` Arend van Spriel
2011-08-16 17:56 ` Dan Carpenter
2011-08-12 13:34 ` [PATCH 02/14] staging: brcm80211: remove iovar IOV_BLOCKSIZE in brcmfmac Arend van Spriel
2011-08-12 14:12 ` Rafał Miłecki
2011-08-12 16:37 ` Arend van Spriel
2011-08-12 20:02 ` Rafał Miłecki
2011-08-12 13:34 ` [PATCH 03/14] staging: brcm80211: remove struct sdioh_info from brcmfmac Arend van Spriel
2011-08-12 13:34 ` [PATCH 04/14] staging: brcm80211: remove global var gInstance " Arend van Spriel
2011-08-12 13:34 ` [PATCH 05/14] staging: brcm80211: remove wext traces in fullmac Arend van Spriel
2011-08-12 13:34 ` [PATCH 06/14] staging: brcm80211: absorb brcmf_sdioh_iovar_op into brcmf_sdcard_iovar_op Arend van Spriel
2011-08-12 13:34 ` Arend van Spriel [this message]
2011-08-12 14:31 ` [PATCH 07/14] staging: brcm80211: absorb brcmf_sdioh_interrupt_register into brcmf_sdcard_intr_reg Rafał Miłecki
2011-08-12 13:34 ` [PATCH 08/14] staging: brcm80211: absorb brcmf_sdioh_interrupt_deregister into brcmf_sdcard_intr_dereg Arend van Spriel
2011-08-12 13:34 ` [PATCH 09/14] staging: brcm80211: absorb brcmf_sdioh_abort into brcmf_sdcard_abort Arend van Spriel
2011-08-12 13:34 ` [PATCH 10/14] staging: brcm80211: remove dead code from dhd_sdio.c Arend van Spriel
2011-08-12 13:34 ` [PATCH 11/14] staging: brcm80211: remove wrapper functions in bcmsdh_sdmmc.c Arend van Spriel
2011-08-12 13:34 ` [PATCH 12/14] staging: brcm80211: remove unused parameter from data interface in fullmac Arend van Spriel
2011-08-12 13:35 ` [PATCH 13/14] staging: brcm80211: remove dead SDTEST code from fullmac Arend van Spriel
2011-08-12 13:35 ` [PATCH 14/14] staging: brcm80211: remove unused func parameter in wl_cfg80211 of fullmac Arend van Spriel
2011-08-12 14:02 ` [PATCH 00/14] staging: brcm80211: brcmfmac driver cleanup Rafał Miłecki
2011-08-12 15:14 ` Hauke Mehrtens
2011-08-12 15:43 ` Rafał Miłecki
2011-08-12 16:32 ` Arend van Spriel
2011-08-12 20:04 ` Rafał Miłecki
2011-08-13 7:47 ` Arend van Spriel
2011-08-13 8:30 ` Rafał Miłecki
2011-08-26 9:20 ` Rafał Miłecki
2011-08-26 17:31 ` Henry Ptasinski
2011-08-26 17:38 ` Jason
2011-08-26 17:44 ` Henry Ptasinski
2011-08-26 20:00 ` Jason
2011-08-26 20:15 ` Henry Ptasinski
2011-08-23 20:07 ` Greg KH
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=1313156101-16817-8-git-send-email-arend@broadcom.com \
--to=arend@broadcom.com \
--cc=devel@linuxdriverproject.org \
--cc=frankyl@broadcom.com \
--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).