diff options
| author | Franky Lin <frankyl@broadcom.com> | 2011-08-12 15:34:56 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-23 13:06:39 -0700 |
| commit | 8c1d08537bde4fc816da775e0a6f11442498e98d (patch) | |
| tree | 1a0c321cf1c587370b033a34aa8d8955ba9164f4 /drivers/staging/brcm80211 | |
| parent | 7b687524f78dac9d521051483e7e77154c314be5 (diff) | |
staging: brcm80211: absorb brcmf_sdioh_abort into brcmf_sdcard_abort
brcmfmac wrapper function cleanup
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211')
| -rw-r--r-- | drivers/staging/brcm80211/brcmfmac/bcmsdh.c | 11 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 14 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/brcmfmac/sdio_host.h | 3 |
3 files changed, 10 insertions, 18 deletions
diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh.c index 6c1b57d2faa..8bb84a98566 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.h> #include <linux/mmc/sdio_func.h> #include <linux/mmc/card.h> @@ -476,7 +477,15 @@ int brcmf_sdcard_rwdata(struct brcmf_sdio_dev *sdiodev, uint rw, u32 addr, int brcmf_sdcard_abort(struct brcmf_sdio_dev *sdiodev, uint fn) { - return brcmf_sdioh_abort(sdiodev, fn); + char t_func = (char)fn; + BRCMF_TRACE(("%s: Enter\n", __func__)); + + /* issue abort cmd52 command through F0 */ + brcmf_sdioh_request_byte(sdiodev, SDIOH_WRITE, SDIO_FUNC_0, + SDIO_CCCR_ABORT, &t_func); + + BRCMF_TRACE(("%s: Exit\n", __func__)); + return 0; } u32 brcmf_sdcard_cur_sbwad(struct brcmf_sdio_dev *sdiodev) diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c index 1dfad3e13e0..d7648f867c9 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c @@ -576,20 +576,6 @@ brcmf_sdioh_request_buffer(struct brcmf_sdio_dev *sdiodev, uint pio_dma, return Status; } -/* this function performs "abort" for both of host & device */ -extern int brcmf_sdioh_abort(struct brcmf_sdio_dev *sdiodev, uint func) -{ - char t_func = (char)func; - BRCMF_TRACE(("%s: Enter\n", __func__)); - - /* issue abort cmd52 command through F0 */ - brcmf_sdioh_request_byte(sdiodev, SDIOH_WRITE, SDIO_FUNC_0, - SDIO_CCCR_ABORT, &t_func); - - BRCMF_TRACE(("%s: Exit\n", __func__)); - return 0; -} - /* Read client card reg */ int brcmf_sdioh_card_regread(struct brcmf_sdio_dev *sdiodev, int func, u32 regaddr, diff --git a/drivers/staging/brcm80211/brcmfmac/sdio_host.h b/drivers/staging/brcm80211/brcmfmac/sdio_host.h index d9803071d03..555f17bab9a 100644 --- a/drivers/staging/brcm80211/brcmfmac/sdio_host.h +++ b/drivers/staging/brcm80211/brcmfmac/sdio_host.h @@ -273,9 +273,6 @@ extern int brcmf_sdioh_cfg_read(struct brcmf_sdio_dev *sdiodev, uint fuc, extern int brcmf_sdioh_cfg_write(struct brcmf_sdio_dev *sdiodev, uint fuc, u32 addr, u8 *data); -/* Issue abort to the specified function and clear controller as needed */ -extern int brcmf_sdioh_abort(struct brcmf_sdio_dev *sdiodev, uint fnc); - /* Watchdog timer interface for pm ops */ extern void brcmf_sdio_wdtmr_enable(struct brcmf_sdio_dev *sdiodev, bool enable); |