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

staging: brcm80211: remove unused sdioh command type code in fullmac

Browse Source 
sdioh command type is not used in brcmf_sdioh_request_word. This patch
removes the related code.

Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Franky Lin
2011-09-01 11:17:07 +02:00
committed by Greg Kroah-Hartman
parent fee3b8ba8b
commit b0dea9c07c
3 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,10 +37,6 @@
#define SDIOH_API_ACCESS_RETRY_LIMIT 2 #define SDIOH_API_ACCESS_RETRY_LIMIT 2
#define SDIOH_CMD_TYPE_NORMAL 0 /* Normal command */
#define SDIOH_CMD_TYPE_APPEND 1 /* Append command */
#define SDIOH_CMD_TYPE_CUTTHRU 2 /* Cut-through command */
/* Module parameters specific to each host-controller driver */ /* Module parameters specific to each host-controller driver */
module_param(sd_f2_blocksize, int, 0); module_param(sd_f2_blocksize, int, 0);
@@ -311,8 +307,8 @@ u32 brcmf_sdcard_reg_read(struct brcmf_sdio_dev *sdiodev, u32 addr, uint size)
if (size == 4) if (size == 4)
addr |= SBSDIO_SB_ACCESS_2_4B_FLAG; addr |= SBSDIO_SB_ACCESS_2_4B_FLAG;
status = brcmf_sdioh_request_word(sdiodev, SDIOH_CMD_TYPE_NORMAL, status = brcmf_sdioh_request_word(sdiodev, SDIOH_READ, SDIO_FUNC_1,
SDIOH_READ, SDIO_FUNC_1, addr, &word, size); addr, &word, size);
sdiodev->regfail = (status != 0); sdiodev->regfail = (status != 0);
@@ -360,8 +356,8 @@ u32 brcmf_sdcard_reg_write(struct brcmf_sdio_dev *sdiodev, u32 addr, uint size,
if (size == 4) if (size == 4)
addr |= SBSDIO_SB_ACCESS_2_4B_FLAG; addr |= SBSDIO_SB_ACCESS_2_4B_FLAG;
status = status =
brcmf_sdioh_request_word(sdiodev, SDIOH_CMD_TYPE_NORMAL, brcmf_sdioh_request_word(sdiodev, SDIOH_WRITE, SDIO_FUNC_1,
SDIOH_WRITE, SDIO_FUNC_1, addr, &data, size); addr, &data, size);
sdiodev->regfail = (status != 0); sdiodev->regfail = (status != 0);
if (status == 0) if (status == 0)

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

@@ -347,7 +347,7 @@ brcmf_sdioh_request_byte(struct brcmf_sdio_dev *sdiodev, uint rw, uint func,
} }
extern int extern int
brcmf_sdioh_request_word(struct brcmf_sdio_dev *sdiodev, uint cmd_type, uint rw, brcmf_sdioh_request_word(struct brcmf_sdio_dev *sdiodev, uint rw,
uint func, uint addr, u32 *word, uint nbytes) uint func, uint addr, u32 *word, uint nbytes)
{ {
int err_ret = -EIO; int err_ret = -EIO;
@@ -357,8 +357,8 @@ brcmf_sdioh_request_word(struct brcmf_sdio_dev *sdiodev, uint cmd_type, uint rw,
return -EINVAL; return -EINVAL;
} }
brcmf_dbg(INFO, "cmd_type=%d, rw=%d, func=%d, addr=0x%05x, nbytes=%d\n", brcmf_dbg(INFO, "rw=%d, func=%d, addr=0x%05x, nbytes=%d\n",
cmd_type, rw, func, addr, nbytes); rw, func, addr, nbytes);
brcmf_pm_resume_wait(sdiodev, sdioh_request_word_wait); brcmf_pm_resume_wait(sdiodev, sdioh_request_word_wait);
if (brcmf_pm_resume_error(sdiodev)) if (brcmf_pm_resume_error(sdiodev))
@@ -566,7 +566,7 @@ brcmf_sdioh_card_regread(struct brcmf_sdio_dev *sdiodev, int func, u32 regaddr,
*data &= 0xff; *data &= 0xff;
brcmf_dbg(DATA, "byte read data=0x%02x\n", *data); brcmf_dbg(DATA, "byte read data=0x%02x\n", *data);
} else { } else {
brcmf_sdioh_request_word(sdiodev, 0, SDIOH_READ, func, regaddr, brcmf_sdioh_request_word(sdiodev, SDIOH_READ, func, regaddr,
data, regsize); data, regsize);
if (regsize == 2) if (regsize == 2)
*data &= 0xffff; *data &= 0xffff;

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

@@ -247,7 +247,7 @@ extern int brcmf_sdioh_request_byte(struct brcmf_sdio_dev *sdiodev, uint rw,
/* read or write 2/4 bytes using cmd53 */ /* read or write 2/4 bytes using cmd53 */
extern int extern int
brcmf_sdioh_request_word(struct brcmf_sdio_dev *sdiodev, uint cmd_type, brcmf_sdioh_request_word(struct brcmf_sdio_dev *sdiodev,
uint rw, uint fnc, uint addr, uint rw, uint fnc, uint addr,
u32 *word, uint nbyte); u32 *word, uint nbyte);