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
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
*/ */
/* Stop bus module: clear pending frames, disable data flow */ /* 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 */ /* Initialize bus module: prepare for communication w/dongle */
extern int brcmf_sdbrcm_bus_init(struct device *dev); extern int brcmf_sdbrcm_bus_init(struct device *dev);
......
...@@ -1115,7 +1115,7 @@ static void brcmf_bus_detach(struct brcmf_pub *drvr) ...@@ -1115,7 +1115,7 @@ static void brcmf_bus_detach(struct brcmf_pub *drvr)
brcmf_proto_stop(&drvr_priv->pub); brcmf_proto_stop(&drvr_priv->pub);
/* Stop the bus module */ /* Stop the bus module */
brcmf_sdbrcm_bus_stop(drvr_priv->pub.bus); brcmf_sdbrcm_bus_stop(drvr_priv->pub.dev);
} }
} }
} }
......
...@@ -2555,7 +2555,7 @@ static int brcmf_sdbrcm_dpc_thread(void *data) ...@@ -2555,7 +2555,7 @@ static int brcmf_sdbrcm_dpc_thread(void *data)
complete(&bus->dpc_wait); complete(&bus->dpc_wait);
} else { } else {
/* after stopping the bus, exit thread */ /* after stopping the bus, exit thread */
brcmf_sdbrcm_bus_stop(bus); brcmf_sdbrcm_bus_stop(bus->sdiodev->dev);
bus->dpc_tsk = NULL; bus->dpc_tsk = NULL;
break; break;
} }
...@@ -3330,12 +3330,15 @@ brcmf_sdbrcm_download_firmware(struct brcmf_sdio *bus) ...@@ -3330,12 +3330,15 @@ brcmf_sdbrcm_download_firmware(struct brcmf_sdio *bus)
return ret; return ret;
} }
void brcmf_sdbrcm_bus_stop(struct brcmf_sdio *bus) void brcmf_sdbrcm_bus_stop(struct device *dev)
{ {
u32 local_hostintmask; u32 local_hostintmask;
u8 saveclk; u8 saveclk;
uint retries; uint retries;
int err; 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"); brcmf_dbg(TRACE, "Enter\n");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment