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

Commit 291ed3dc authored by Arend van Spriel's avatar Arend van Spriel Committed by John W. Linville
Browse files

brcm80211: smac: remove empty or unused functions from pmu.c 



A number of functions in pmu.c are not used or adding no functionality
at all. These have been removed.

Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: default avatarAlwin Beukers <alwin@broadcom.com>
Signed-off-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 646e2615

drivers/net/wireless/brcm80211/brcmsmac/aiutils.c

+1 −6
Original line number Original line Diff line number Diff line
@@ -721,14 +721,9 @@ static struct si_info *ai_doattach(struct si_info *sii, 




	/* PMU specific initializations */

	/* PMU specific initializations */

	if (ai_get_cccaps(sih) & CC_CAP_PMU) {

	if (ai_get_cccaps(sih) & CC_CAP_PMU) {

		u32 xtalfreq;

		si_pmu_init(sih);

		si_pmu_init(sih);

		si_pmu_chip_init(sih);

		(void)si_pmu_measure_alpclk(sih);



		xtalfreq = si_pmu_measure_alpclk(sih);

		si_pmu_pll_init(sih, xtalfreq);

		si_pmu_res_init(sih);

		si_pmu_res_init(sih);

		si_pmu_swreg_init(sih);

	}

	}





	/* setup the GPIO based LED powersave register */

	/* setup the GPIO based LED powersave register */

drivers/net/wireless/brcm80211/brcmsmac/pmu.c

+0 −57
Original line number Original line Diff line number Diff line
@@ -227,19 +227,6 @@ u16 si_pmu_fast_pwrup_delay(struct si_pub *sih) 
	return (u16) delay;

	return (u16) delay;

}

}





void si_pmu_sprom_enable(struct si_pub *sih, bool enable)

{

	struct chipcregs __iomem *cc;

	uint origidx;



	/* Remember original core before switch to chipc */

	origidx = ai_coreidx(sih);

	cc = ai_setcoreidx(sih, SI_CC_IDX);



	/* Return to original core */

	ai_setcoreidx(sih, origidx);

}



/* Read/write a chipcontrol reg */

/* Read/write a chipcontrol reg */

u32 si_pmu_chipcontrol(struct si_pub *sih, uint reg, u32 mask, u32 val)

u32 si_pmu_chipcontrol(struct si_pub *sih, uint reg, u32 mask, u32 val)

{

{
@@ -325,50 +312,6 @@ void si_pmu_init(struct si_pub *sih) 
		bcma_set32(core, CHIPCREGOFFS(pmucontrol), PCTL_NOILP_ON_WAIT);

		bcma_set32(core, CHIPCREGOFFS(pmucontrol), PCTL_NOILP_ON_WAIT);

}

}





/* initialize PMU chip controls and other chip level stuff */

void si_pmu_chip_init(struct si_pub *sih)

{

	uint origidx;



	/* Gate off SPROM clock and chip select signals */

	si_pmu_sprom_enable(sih, false);



	/* Remember original core */

	origidx = ai_coreidx(sih);



	/* Return to original core */

	ai_setcoreidx(sih, origidx);

}



/* initialize PMU switch/regulators */

void si_pmu_swreg_init(struct si_pub *sih)

{

}



/* initialize PLL */

void si_pmu_pll_init(struct si_pub *sih, uint xtalfreq)

{

	struct chipcregs __iomem *cc;

	uint origidx;



	/* Remember original core before switch to chipc */

	origidx = ai_coreidx(sih);

	cc = ai_setcoreidx(sih, SI_CC_IDX);



	switch (ai_get_chip_id(sih)) {

	case BCM4313_CHIP_ID:

	case BCM43224_CHIP_ID:

	case BCM43225_CHIP_ID:

		/* ??? */

		break;

	default:

		break;

	}



	/* Return to original core */

	ai_setcoreidx(sih, origidx);

}



/* initialize PMU resources */

/* initialize PMU resources */

void si_pmu_res_init(struct si_pub *sih)

void si_pmu_res_init(struct si_pub *sih)

{

{

drivers/net/wireless/brcm80211/brcmsmac/pmu.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -29,10 +29,7 @@ extern void si_pmu_pllupd(struct si_pub *sih); 
extern void si_pmu_spuravoid(struct si_pub *sih, u8 spuravoid);

extern void si_pmu_spuravoid(struct si_pub *sih, u8 spuravoid);

extern u32 si_pmu_pllcontrol(struct si_pub *sih, uint reg, u32 mask, u32 val);

extern u32 si_pmu_pllcontrol(struct si_pub *sih, uint reg, u32 mask, u32 val);

extern void si_pmu_init(struct si_pub *sih);

extern void si_pmu_init(struct si_pub *sih);

extern void si_pmu_chip_init(struct si_pub *sih);

extern void si_pmu_pll_init(struct si_pub *sih, u32 xtalfreq);

extern void si_pmu_res_init(struct si_pub *sih);

extern void si_pmu_res_init(struct si_pub *sih);

extern void si_pmu_swreg_init(struct si_pub *sih);

extern u32 si_pmu_measure_alpclk(struct si_pub *sih);

extern u32 si_pmu_measure_alpclk(struct si_pub *sih);





#endif /* _BRCM_PMU_H_ */
 
#endif /* _BRCM_PMU_H_ */