Commit fee3b8ba authored by Franky Lin's avatar Franky Lin Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: remove unused sdioh data mode code in fullmac 



sdioh data mode is not used in brcmf_sdioh_request_buffer. The patch
removes the related code.

Reviewed-by: default avatarRoland Vossen <rvossen@broadcom.com>
Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarRoland Vossen <rvossen@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 27a29906

drivers/staging/brcm80211/brcmfmac/bcmsdh.c

+6 −9
Original line number Diff line number Diff line
@@ -41,9 +41,6 @@ 
#define SDIOH_CMD_TYPE_APPEND   1	/* Append command */

#define SDIOH_CMD_TYPE_CUTTHRU  2	/* Cut-through command */



#define SDIOH_DATA_PIO          0	/* PIO mode */

#define SDIOH_DATA_DMA          1	/* DMA mode */



/* Module parameters specific to each host-controller driver */



module_param(sd_f2_blocksize, int, 0);
@@ -412,8 +409,8 @@ brcmf_sdcard_recv_buf(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn, 
	if (width == 4)

		addr |= SBSDIO_SB_ACCESS_2_4B_FLAG;



	status = brcmf_sdioh_request_buffer(sdiodev, SDIOH_DATA_PIO,

		incr_fix, SDIOH_READ, fn, addr, width, nbytes, buf, pkt);

	status = brcmf_sdioh_request_buffer(sdiodev, incr_fix, SDIOH_READ,

					    fn, addr, width, nbytes, buf, pkt);



	return status;

}
@@ -448,8 +445,8 @@ brcmf_sdcard_send_buf(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn, 
	if (width == 4)

		addr |= SBSDIO_SB_ACCESS_2_4B_FLAG;



	return brcmf_sdioh_request_buffer(sdiodev, SDIOH_DATA_PIO,

		incr_fix, SDIOH_WRITE, fn, addr, width, nbytes, buf, pkt);

	return brcmf_sdioh_request_buffer(sdiodev, incr_fix, SDIOH_WRITE, fn,

					  addr, width, nbytes, buf, pkt);

}



int brcmf_sdcard_rwdata(struct brcmf_sdio_dev *sdiodev, uint rw, u32 addr,
@@ -458,8 +455,8 @@ int brcmf_sdcard_rwdata(struct brcmf_sdio_dev *sdiodev, uint rw, u32 addr, 
	addr &= SBSDIO_SB_OFT_ADDR_MASK;

	addr |= SBSDIO_SB_ACCESS_2_4B_FLAG;



	return brcmf_sdioh_request_buffer(sdiodev, SDIOH_DATA_PIO,

		SDIOH_DATA_INC, (rw ? SDIOH_WRITE : SDIOH_READ), SDIO_FUNC_1,

	return brcmf_sdioh_request_buffer(sdiodev, SDIOH_DATA_INC,

		(rw ? SDIOH_WRITE : SDIOH_READ), SDIO_FUNC_1,

		addr, 4, nbytes, buf, NULL);

}

drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c

+1 −1
Original line number Diff line number Diff line
@@ -478,7 +478,7 @@ brcmf_sdioh_request_packet(struct brcmf_sdio_dev *sdiodev, uint fix_inc, 
 *

 */

extern int

brcmf_sdioh_request_buffer(struct brcmf_sdio_dev *sdiodev, uint pio_dma,

brcmf_sdioh_request_buffer(struct brcmf_sdio_dev *sdiodev,

			   uint fix_inc, uint write, uint func, uint addr,

			   uint reg_width, uint buflen_u, u8 *buffer,

			   struct sk_buff *pkt)

drivers/staging/brcm80211/brcmfmac/sdio_host.h

+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ brcmf_sdioh_request_word(struct brcmf_sdio_dev *sdiodev, uint cmd_type, 


/* read or write any buffer using cmd53 */

extern int

brcmf_sdioh_request_buffer(struct brcmf_sdio_dev *sdiodev, uint pio_dma,

brcmf_sdioh_request_buffer(struct brcmf_sdio_dev *sdiodev,

			   uint fix_inc, uint rw, uint fnc_num,

			   u32 addr, uint regwidth,

			   u32 buflen, u8 *buffer, struct sk_buff *pkt);

CRA Git | Maintained and supported by SUSTech CRA and CCSE