Message ID | 1510605347-7629-2-git-send-email-arend.vanspriel@broadcom.com (mailing list archive) |
---|---|
State | Accepted |
Commit | 1fd3ae124d5e675f57cf7e3c601fb8f7712e0329 |
Delegated to: | Kalle Valo |
Headers | show |
Arend Van Spriel <arend.vanspriel@broadcom.com> wrote: > From: Ian Molton <ian@mnementh.co.uk> > > All the other IO functions are the other way round in this > driver. Make this one match. > > Signed-off-by: Ian Molton <ian@mnementh.co.uk> > Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com> 10 patches applied to wireless-drivers-next.git, thanks. 1fd3ae124d5e brcmfmac: Fix parameter order in brcmf_sdiod_f0_writeb() 1e6f676f43aa brcmfmac: Register sizes on hardware are not dependent on compiler types 0fcc9fe00484 brcmfmac: Split brcmf_sdiod_regrw_helper() up. b9b0d290bc0c brcmfmac: Clean up brcmf_sdiod_set_sbaddr_window() ea243e9077b3 brcmfmac: Remove dead IO code 4a3338ba2a74 brcmfmac: Remove bandaid for SleepCSR 993a98a42e6e brcmfmac: Remove brcmf_sdiod_request_data() 3508a056a1f4 brcmfmac: Fix asymmetric IO functions. 12e3e74e2820 brcmfmac: Remove noisy debugging. dd8a2d49e4ed brcmfmac: Rename bcmerror to err
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c index cd58732..a8976a76 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c @@ -230,8 +230,8 @@ void brcmf_sdiod_change_state(struct brcmf_sdio_dev *sdiodev, sdiodev->state = state; } -static inline int brcmf_sdiod_f0_writeb(struct sdio_func *func, - uint regaddr, u8 byte) +static inline int brcmf_sdiod_f0_writeb(struct sdio_func *func, u8 byte, + uint regaddr) { int err_ret; @@ -269,8 +269,8 @@ static int brcmf_sdiod_request_data(struct brcmf_sdio_dev *sdiodev, u8 fn, if (fn) sdio_writeb(func, *(u8 *)data, addr, &ret); else - ret = brcmf_sdiod_f0_writeb(func, addr, - *(u8 *)data); + ret = brcmf_sdiod_f0_writeb(func, *(u8 *)data, + addr); } else { if (fn) *(u8 *)data = sdio_readb(func, addr, &ret);