evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

brcmfmac: rename brcmf_sdio_buffrw()

Browse source 
The function brcmf_sdio_buffrw() is intended to be used for
transfering list of packets using scatter-gather functionality.
Rename function to brcmf_sdio_sglist_rw() to clarify this.

Reviewed-by: Franky Lin <frankyl@broadcom.com>
Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Arend van Spriel 2013-10-15 15:44:51 +02:00 • committed by John W. Linville
parent 7f9a8dc817
commit 0d7d98216d
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
View file

@ -315,7 +315,7 @@ void brcmf_sdio_regwl(struct brcmf_sdio_dev *sdiodev, u32 addr,
} }
/** /**
* brcmf_sdio_buffrw - SDIO interface function for block data access * brcmf_sdio_sglist_rw - SDIO interface function for block data access
* @sdiodev: brcmfmac sdio device * @sdiodev: brcmfmac sdio device
* @fn: SDIO function number * @fn: SDIO function number
* @write: direction flag * @write: direction flag
@ -326,8 +326,9 @@ void brcmf_sdio_regwl(struct brcmf_sdio_dev *sdiodev, u32 addr,
* stack for block data access. It assumes that the skb passed down by the * stack for block data access. It assumes that the skb passed down by the
* caller has already been padded and aligned. * caller has already been padded and aligned.
*/ */
static int brcmf_sdio_buffrw(struct brcmf_sdio_dev *sdiodev, uint fn, static int brcmf_sdio_sglist_rw(struct brcmf_sdio_dev *sdiodev, uint fn,
bool write, u32 addr, struct sk_buff_head *pktlist) bool write, u32 addr,
struct sk_buff_head *pktlist)
{ {
unsigned int req_sz, func_blk_sz, sg_cnt, sg_data_sz, pkt_offset; unsigned int req_sz, func_blk_sz, sg_cnt, sg_data_sz, pkt_offset;
unsigned int max_req_sz, orig_offset, dst_offset; unsigned int max_req_sz, orig_offset, dst_offset;
@ -554,7 +555,7 @@ brcmf_sdcard_recv_pkt(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
skb_queue_head_init(&pkt_list); skb_queue_head_init(&pkt_list);
skb_queue_tail(&pkt_list, pkt); skb_queue_tail(&pkt_list, pkt);
err = brcmf_sdio_buffrw(sdiodev, fn, false, addr, &pkt_list); err = brcmf_sdio_sglist_rw(sdiodev, fn, false, addr, &pkt_list);
skb_dequeue_tail(&pkt_list); skb_dequeue_tail(&pkt_list);
done: done:
@ -577,7 +578,7 @@ int brcmf_sdcard_recv_chain(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
goto done; goto done;
incr_fix = (flags & SDIO_REQ_FIXED) ? SDIOH_DATA_FIX : SDIOH_DATA_INC; incr_fix = (flags & SDIO_REQ_FIXED) ? SDIOH_DATA_FIX : SDIOH_DATA_INC;
err = brcmf_sdio_buffrw(sdiodev, fn, false, addr, pktq); err = brcmf_sdio_sglist_rw(sdiodev, fn, false, addr, pktq);
done: done:
return err; return err;
@ -622,7 +623,7 @@ brcmf_sdcard_send_pkt(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
width = (flags & SDIO_REQ_4BYTE) ? 4 : 2; width = (flags & SDIO_REQ_4BYTE) ? 4 : 2;
brcmf_sdio_addrprep(sdiodev, width, &addr); brcmf_sdio_addrprep(sdiodev, width, &addr);
err = brcmf_sdio_buffrw(sdiodev, fn, true, addr, pktq); err = brcmf_sdio_sglist_rw(sdiodev, fn, true, addr, pktq);
return err; return err;
} }
@ -673,7 +674,7 @@ brcmf_sdio_ramrw(struct brcmf_sdio_dev *sdiodev, bool write, u32 address,
if (write) if (write)
memcpy(pkt->data, data, dsize); memcpy(pkt->data, data, dsize);
skb_queue_tail(&pkt_list, pkt); skb_queue_tail(&pkt_list, pkt);
bcmerror = brcmf_sdio_buffrw(sdiodev, SDIO_FUNC_1, write, bcmerror = brcmf_sdio_sglist_rw(sdiodev, SDIO_FUNC_1, write,
sdaddr, &pkt_list); sdaddr, &pkt_list);
skb_dequeue_tail(&pkt_list); skb_dequeue_tail(&pkt_list);
if (bcmerror) { if (bcmerror) {