Commit db3cbaa4 authored by Arend van Spriel's avatar Arend van Spriel Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: remove otp power control functions 



For the devices supported by brcmsmac driver the OTP device is always
powered. Functions for reading power status and changing it are not
needed.

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

drivers/staging/brcm80211/brcmsmac/aiutils.c

+0 −14
Original line number Diff line number Diff line
@@ -2277,17 +2277,3 @@ bool ai_is_otp_disabled(struct si_pub *sih) 
		return false;

	}

}
 


bool ai_is_otp_powered(struct si_pub *sih)

{

	if (PMUCTL_ENAB(sih))

		return si_pmu_is_otp_powered(sih);

	return true;

}



void ai_otp_power(struct si_pub *sih, bool on)

{

	if (PMUCTL_ENAB(sih))

		si_pmu_otp_power(sih, on);

	udelay(1000);

}

drivers/staging/brcm80211/brcmsmac/aiutils.h

+0 −2
Original line number Diff line number Diff line
@@ -558,8 +558,6 @@ extern u32 ai_gpiocontrol(struct si_pub *sih, u32 mask, u32 val, 


/* OTP status */

extern bool ai_is_otp_disabled(struct si_pub *sih);

extern bool ai_is_otp_powered(struct si_pub *sih);

extern void ai_otp_power(struct si_pub *sih, bool on);



/* SPROM availability */

extern bool ai_is_sprom_available(struct si_pub *sih);

drivers/staging/brcm80211/brcmsmac/otp.c

+2 −13
Original line number Diff line number Diff line
@@ -310,10 +310,7 @@ static void *ipxotp_init(struct si_pub *sih) 
	if (ai_is_otp_disabled(sih))

		return NULL;



	/* Make sure OTP is powered up */

	if (!ai_is_otp_powered(sih))

		return NULL;



	/* OTP is always powered */

	oi = &otpinfo;



	/* Check for otp size */
@@ -518,15 +515,10 @@ void *otp_init(struct si_pub *sih) 
int

otp_read_region(struct si_pub *sih, int region, u16 *data,

				 uint *wlen) {

	bool wasup = false;

	void *oh;

	int err = 0;



	wasup = ai_is_otp_powered(sih);

	if (!wasup)

		ai_otp_power(sih, true);



	if (!ai_is_otp_powered(sih) || ai_is_otp_disabled(sih)) {

	if (ai_is_otp_disabled(sih)) {

		err = -EPERM;

		goto out;

	}
@@ -540,9 +532,6 @@ otp_read_region(struct si_pub *sih, int region, u16 *data, 
	err = (((otpinfo_t *) oh)->fn->read_region) (oh, region, data, wlen);



 out:

	if (!wasup)

		ai_otp_power(sih, false);



	return err;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE