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

Commit 4fbb7b81 authored by Roland Vossen's avatar Roland Vossen Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: removed brcmf_sdioh_reset() 



Code cleanup. This function did not perform a reset, hence it was removed.

Signed-off-by: default avatarRoland Vossen <rvossen@broadcom.com>
Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Reviewed-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 7d72d306

drivers/staging/brcm80211/brcmfmac/bcmsdbus.h

+0 −3
Original line number Diff line number Diff line
@@ -97,9 +97,6 @@ extern int brcmf_sdioh_abort(struct sdioh_info *si, uint fnc); 
extern int brcmf_sdioh_start(struct sdioh_info *si, int stage);

extern int brcmf_sdioh_stop(struct sdioh_info *si);



/* Reset and re-initialize the device */

extern int brcmf_sdioh_reset(struct sdioh_info *si);



/* Helper function */

void *brcmf_sdcard_get_sdioh(struct brcmf_sdio_card *card);

drivers/staging/brcm80211/brcmfmac/bcmsdh.c

+0 −5
Original line number Diff line number Diff line
@@ -545,11 +545,6 @@ uint brcmf_sdcard_query_iofnum(struct brcmf_sdio_card *card) 
	return brcmf_sdioh_query_iofnum(card->sdioh);

}



int brcmf_sdcard_reset(struct brcmf_sdio_card *card)

{

	return brcmf_sdioh_reset(card->sdioh);

}



void *brcmf_sdcard_get_sdioh(struct brcmf_sdio_card *card)

{

	ASSERT(card);

drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c

+0 −8
Original line number Diff line number Diff line
@@ -846,14 +846,6 @@ extern int brcmf_sdioh_abort(struct sdioh_info *sd, uint func) 
	return 0;

}



/* Reset and re-initialize the device */

int brcmf_sdioh_reset(struct sdioh_info *si)

{

	sd_trace(("%s: Enter\n", __func__));

	sd_trace(("%s: Exit\n", __func__));

	return 0;

}



/* Disable device interrupt */

void brcmf_sdioh_dev_intr_off(struct sdioh_info *sd)

{

drivers/staging/brcm80211/brcmfmac/dhd_sdio.c

+0 −2
Original line number Diff line number Diff line
@@ -6013,8 +6013,6 @@ int brcmf_bus_devreset(struct brcmf_pub *dhdp, u8 flag) 


		if (bus->dhd->dongle_reset) {

			/* Turn on WLAN */

			/* Reset SD client */

			brcmf_sdcard_reset(bus->card);



			/* Attempt to re-attach & download */

			if (brcmf_sdbrcm_probe_attach(bus, bus->card,

drivers/staging/brcm80211/brcmfmac/sdio_host.h

+0 −3
Original line number Diff line number Diff line
@@ -207,9 +207,6 @@ extern int brcmf_sdcard_iovar_op(struct brcmf_sdio_card *card, const char *name, 
				 void *params, int plen, void *arg, int len,

				 bool set);



/* Reset and reinitialize the device */

extern int brcmf_sdcard_reset(struct brcmf_sdio_card *card);



/* helper functions */



extern void *brcmf_sdcard_get_sdioh(struct brcmf_sdio_card *card);