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

Commit 94c2fb82 authored by Franky Lin's avatar Franky Lin Committed by John W. Linville
Browse files

brcm80211: fmac: change function bus_stop parameter 



Change parameter to device pointer for bus layer interface function
brcmf_sdbrcm_bus_stop. 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 c0a7962a

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

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
 */



/* Stop bus module: clear pending frames, disable data flow */

extern void brcmf_sdbrcm_bus_stop(struct brcmf_sdio *bus);

extern void brcmf_sdbrcm_bus_stop(struct device *dev);



/* Initialize bus module: prepare for communication w/dongle */

extern int brcmf_sdbrcm_bus_init(struct device *dev);

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

+1 −1
Original line number Diff line number Diff line
@@ -1115,7 +1115,7 @@ static void brcmf_bus_detach(struct brcmf_pub *drvr) 
			brcmf_proto_stop(&drvr_priv->pub);



			/* Stop the bus module */

			brcmf_sdbrcm_bus_stop(drvr_priv->pub.bus);

			brcmf_sdbrcm_bus_stop(drvr_priv->pub.dev);

		}

	}

}

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

+5 −2
Original line number Diff line number Diff line
@@ -2555,7 +2555,7 @@ static int brcmf_sdbrcm_dpc_thread(void *data) 
					complete(&bus->dpc_wait);

			} else {

				/* after stopping the bus, exit thread */

				brcmf_sdbrcm_bus_stop(bus);

				brcmf_sdbrcm_bus_stop(bus->sdiodev->dev);

				bus->dpc_tsk = NULL;

				break;

			}
@@ -3330,12 +3330,15 @@ brcmf_sdbrcm_download_firmware(struct brcmf_sdio *bus) 
	return ret;

}



void brcmf_sdbrcm_bus_stop(struct brcmf_sdio *bus)

void brcmf_sdbrcm_bus_stop(struct device *dev)

{

	u32 local_hostintmask;

	u8 saveclk;

	uint retries;

	int err;

	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");