diff --git a/[refs] b/[refs]
index 1ac5fd9aa981..94d86ee94a9c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bd42e67bbece0088c3bc2ffb675ddd32eb3bf57d
+refs/heads/master: 43e45c3e89478694dd12619ff15a2ec12d80a36c
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh.c b/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh.c
index 5906337780b0..bff9dcd6fadc 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh.c
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh.c
@@ -362,16 +362,6 @@ int brcmf_sdio_remove(struct brcmf_sdio_dev *sdiodev)
 }
 EXPORT_SYMBOL(brcmf_sdio_remove);
 
-int brcmf_sdio_register(void)
-{
-	return brcmf_sdio_function_init();
-}
-
-void brcmf_sdio_unregister(void)
-{
-	brcmf_sdio_function_cleanup();
-}
-
 void brcmf_sdio_wdtmr_enable(struct brcmf_sdio_dev *sdiodev, bool enable)
 {
 	if (enable)
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
index fc95bb248463..e919de210f70 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
@@ -609,23 +609,15 @@ static struct sdio_driver brcmf_sdmmc_driver = {
 #endif	/* CONFIG_PM_SLEEP */
 };
 
-/*
- * module init
-*/
-int brcmf_sdio_function_init(void)
+/* bus register interface */
+int brcmf_bus_register(void)
 {
-	int error = 0;
 	brcmf_dbg(TRACE, "Enter\n");
 
-	error = sdio_register_driver(&brcmf_sdmmc_driver);
-
-	return error;
+	return sdio_register_driver(&brcmf_sdmmc_driver);
 }
 
-/*
- * module cleanup
-*/
-void brcmf_sdio_function_cleanup(void)
+void brcmf_bus_unregister(void)
 {
 	brcmf_dbg(TRACE, "Enter\n");
 
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
index 0ae8dc03c8ad..0f7b80da41d0 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
@@ -4533,20 +4533,6 @@ void brcmf_sdbrcm_disconnect(void *ptr)
 	brcmf_dbg(TRACE, "Disconnected\n");
 }
 
-int brcmf_bus_register(void)
-{
-	brcmf_dbg(TRACE, "Enter\n");
-
-	return brcmf_sdio_register();
-}
-
-void brcmf_bus_unregister(void)
-{
-	brcmf_dbg(TRACE, "Enter\n");
-
-	brcmf_sdio_unregister();
-}
-
 struct device *brcmf_bus_get_device(struct brcmf_bus *bus)
 {
 	return &bus->sdiodev->func[2]->dev;
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/sdio_host.h b/trunk/drivers/staging/brcm80211/brcmfmac/sdio_host.h
index 397ad48803de..726fa8981113 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/sdio_host.h
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/sdio_host.h
@@ -211,10 +211,6 @@ extern int brcmf_sdcard_rwdata(struct brcmf_sdio_dev *sdiodev, uint rw,
 extern int brcmf_sdcard_abort(struct brcmf_sdio_dev *sdiodev, uint fn);
 
 /* platform specific/high level functions */
-extern int brcmf_sdio_function_init(void);
-extern int brcmf_sdio_register(void);
-extern void brcmf_sdio_unregister(void);
-extern void brcmf_sdio_function_cleanup(void);
 extern int brcmf_sdio_probe(struct brcmf_sdio_dev *sdiodev);
 extern int brcmf_sdio_remove(struct brcmf_sdio_dev *sdiodev);