openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: brcm80211: remove MMC_SDIO_ABORT macro definition 

The fullmac driver is always needing the code conditionalized with
MMC_SDIO_ABORT macro so the macro has been removed and the code
is always compiled in.

Signed-off-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Arend van Spriel 2011-06-29 16:47:32 -07:00 committed by Greg Kroah-Hartman
parent 248dcbb0ed
commit e2f3d544d8
2 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/staging/brcm80211/brcmfmac/Makefile
View File

@ -21,7 +21,6 @@ ccflags-y := \
-DBRCMF_FIRSTREAD=64 \ -DBRCMF_FIRSTREAD=64 \
-DBRCMF_SDALIGN=64 \ -DBRCMF_SDALIGN=64 \
-DMAX_HDR_READ=64 \ -DMAX_HDR_READ=64 \
-DMMC_SDIO_ABORT \
-DSHOW_EVENTS \ -DSHOW_EVENTS \
-DTOE -DTOE

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

@ -667,7 +667,6 @@ brcmf_sdioh_request_byte(struct sdioh_info *sd, uint rw, uint func,
sdio_release_host(gInstance->func[2]); sdio_release_host(gInstance->func[2]);
} }
} }
#if defined(MMC_SDIO_ABORT)
/* to allow abort command through F1 */ /* to allow abort command through F1 */
else if (regaddr == SDIO_CCCR_ABORT) { else if (regaddr == SDIO_CCCR_ABORT) {
sdio_claim_host(gInstance->func[func]); sdio_claim_host(gInstance->func[func]);
@ -681,7 +680,6 @@ brcmf_sdioh_request_byte(struct sdioh_info *sd, uint rw, uint func,
regaddr, &err_ret); regaddr, &err_ret);
sdio_release_host(gInstance->func[func]); sdio_release_host(gInstance->func[func]);
} }
#endif /* MMC_SDIO_ABORT */
else if (regaddr < 0xF0) { else if (regaddr < 0xF0) {
sd_err(("bcmsdh_sdmmc: F0 Wr:0x%02x: write " sd_err(("bcmsdh_sdmmc: F0 Wr:0x%02x: write "
"disallowed\n", regaddr)); "disallowed\n", regaddr));
@ -951,16 +949,12 @@ brcmf_sdioh_request_buffer(struct sdioh_info *sd, uint pio_dma, uint fix_inc,
/* this function performs "abort" for both of host & device */ /* this function performs "abort" for both of host & device */
extern int brcmf_sdioh_abort(struct sdioh_info *sd, uint func) extern int brcmf_sdioh_abort(struct sdioh_info *sd, uint func)
{ {
#if defined(MMC_SDIO_ABORT)
char t_func = (char)func; char t_func = (char)func;
#endif /* defined(MMC_SDIO_ABORT) */
sd_trace(("%s: Enter\n", __func__)); sd_trace(("%s: Enter\n", __func__));
#if defined(MMC_SDIO_ABORT)
/* issue abort cmd52 command through F0 */ /* issue abort cmd52 command through F0 */
brcmf_sdioh_request_byte(sd, SDIOH_WRITE, SDIO_FUNC_0, SDIO_CCCR_ABORT, brcmf_sdioh_request_byte(sd, SDIOH_WRITE, SDIO_FUNC_0, SDIO_CCCR_ABORT,
&t_func); &t_func);
#endif /* defined(MMC_SDIO_ABORT) */
sd_trace(("%s: Exit\n", __func__)); sd_trace(("%s: Exit\n", __func__));
return SDIOH_API_RC_SUCCESS; return SDIOH_API_RC_SUCCESS;