From: Franky Lin Date: Wed, 1 Jun 2011 11:45:02 +0000 (+0200) Subject: staging: brcm80211: remove iovars IOV_POWER X-Git-Tag: MMI-PSA29.97-13-9~18845^2~568^2~157 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=23e5a7cd3e410bde0553844c36c72cb0909553d7;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git staging: brcm80211: remove iovars IOV_POWER Remove unused sdio related iovars IOV_POWER for fullmac driver Signed-off-by: Franky Lin Reviewed-by: Roland Vossen Reviewed-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c index ab4d0cc9a596..5b8529c5a835 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c @@ -365,10 +365,6 @@ void bcmsdh_unregister_oob_intr(void) extern uint sd_msglevel; /* Debug message level */ module_param(sd_msglevel, uint, 0); -extern uint sd_power; /* 0 = SD Power OFF, - 1 = SD Power ON. */ -module_param(sd_power, uint, 0); - extern uint sd_clock; /* SD Clock Control, 0 = SD Clock OFF, 1 = SD Clock ON */ module_param(sd_clock, uint, 0); diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c index 02fa5b437d18..a2d0ad848566 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c @@ -48,7 +48,6 @@ extern PBCMSDH_SDMMC_INSTANCE gInstance; uint sd_sdmode = SDIOH_MODE_SD4; /* Use SD4 mode by default */ uint sd_f2_blocksize = 512; /* Default blocksize */ -uint sd_power = 1; /* Default to SD Slot powered ON */ uint sd_clock = 1; /* Default to SD Clock turned ON */ uint sd_hiok = false; /* Don't use hi-speed mode by default */ uint sd_msglevel = 0x01; @@ -355,7 +354,6 @@ enum { IOV_SDMODE, IOV_HISPEED, IOV_HCIREGS, - IOV_POWER, IOV_CLOCK, IOV_RXCHAIN }; @@ -368,8 +366,6 @@ const bcm_iovar_t sdioh_iovars[] = { {"sd_numints", IOV_NUMINTS, 0, IOVT_UINT32, 0}, {"sd_devreg", IOV_DEVREG, 0, IOVT_BUFFER, sizeof(sdreg_t)} , - {"sd_power", IOV_POWER, 0, IOVT_UINT32, 0} - , {"sd_clock", IOV_CLOCK, 0, IOVT_UINT32, 0} , {"sd_mode", IOV_SDMODE, 0, IOVT_UINT32, 100} @@ -506,15 +502,6 @@ sdioh_iovar_op(sdioh_info_t *si, const char *name, break; - case IOV_GVAL(IOV_POWER): - int_val = (u32) sd_power; - memcpy(arg, &int_val, val_size); - break; - - case IOV_SVAL(IOV_POWER): - sd_power = int_val; - break; - case IOV_GVAL(IOV_CLOCK): int_val = (u32) sd_clock; memcpy(arg, &int_val, val_size);