Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 47a1ce78 authored by Franky Lin's avatar Franky Lin Committed by John W. Linville
Browse files

brcm80211: fmac: change function bus_txctl parameter 



Change paramter to device pointer for bus layer interface function
brcmf_sdbrcm_bus_txctl. This is part of the fullmac bus interface
refactoring.

Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 532cdd3b

drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ extern int brcmf_sdbrcm_bus_txdata(struct brcmf_sdio *bus, struct sk_buff *txp); 
 * Expects caller to enforce a single outstanding transaction.

 */

extern int

brcmf_sdbrcm_bus_txctl(struct brcmf_sdio *bus, unsigned char *msg, uint msglen);

brcmf_sdbrcm_bus_txctl(struct device *dev, unsigned char *msg, uint msglen);



extern int

brcmf_sdbrcm_bus_rxctl(struct device *dev, unsigned char *msg, uint msglen);

drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ static int brcmf_proto_cdc_msg(struct brcmf_pub *drvr) 
		len = CDC_MAX_MSG_SIZE;



	/* Send request */

	return brcmf_sdbrcm_bus_txctl(drvr->bus, (unsigned char *)&prot->msg,

	return brcmf_sdbrcm_bus_txctl(drvr->dev, (unsigned char *)&prot->msg,

				      len);

}

drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c

+4 −1
Original line number Diff line number Diff line
@@ -2797,7 +2797,7 @@ static int brcmf_tx_frame(struct brcmf_sdio *bus, u8 *frame, u16 len) 
}



int

brcmf_sdbrcm_bus_txctl(struct brcmf_sdio *bus, unsigned char *msg, uint msglen)

brcmf_sdbrcm_bus_txctl(struct device *dev, unsigned char *msg, uint msglen)

{

	u8 *frame;

	u16 len;
@@ -2805,6 +2805,9 @@ brcmf_sdbrcm_bus_txctl(struct brcmf_sdio *bus, unsigned char *msg, uint msglen) 
	uint retries = 0;

	u8 doff = 0;

	int ret = -1;

	struct brcmf_bus *bus_if = dev_get_drvdata(dev);

	struct brcmf_sdio_dev *sdiodev = bus_if->bus_priv;

	struct brcmf_sdio *bus = sdiodev->bus;



	brcmf_dbg(TRACE, "Enter\n");