lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: brcm80211: absorb brcmf_sdioh_abort into brcmf_sdcard_abort

Browse Source 
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>
This commit is contained in:
Franky Lin
2011-08-12 15:34:56 +02:00
committed by Greg Kroah-Hartman
parent 7b687524f7
commit 8c1d08537b
3 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/staging/brcm80211/brcmfmac/bcmsdh.c
View File

@@ -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)

14
drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
View File

@@ -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,

3
drivers/staging/brcm80211/brcmfmac/sdio_host.h
View File

@@ -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);