From: Arend van Spriel Date: Tue, 3 May 2011 09:35:36 +0000 (+0200) Subject: staging: brcm80211: remove use of si_* functions from wlc_phy_lcn.c X-Git-Tag: upstream/snapshot3+hdmi~10345^2~557 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7754116bab5b69491dbb6eb320e59b244624df63;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git staging: brcm80211: remove use of si_* functions from wlc_phy_lcn.c The source file used si_alp_clock to determine crystal frequency. It now uses the si_pmu_alp_clock call instead to remove dependency from siutils functionality. Cc: devel@linuxdriverproject.org Cc: linux-wireless@vger.kernel.org Cc: Brett Rudley Cc: Henry Ptasinski Cc: Roland Vossen Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c index 9f5ee40..4e7a20a 100644 --- a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c +++ b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c @@ -5053,7 +5053,7 @@ bool wlc_phy_attach_lcnphy(phy_info_t *pi) pi->hwpwrctrl_capable = true; } - pi->xtalfreq = si_alp_clock(pi->sh->sih); + pi->xtalfreq = si_pmu_alp_clock(pi->sh->sih); pi_lcn->lcnphy_papd_rxGnCtrl_init = 0; pi->pi_fptr.init = wlc_phy_init_lcnphy; diff --git a/drivers/staging/brcm80211/util/hndpmu.c b/drivers/staging/brcm80211/util/hndpmu.c index ffa2e2d..566e030 100644 --- a/drivers/staging/brcm80211/util/hndpmu.c +++ b/drivers/staging/brcm80211/util/hndpmu.c @@ -1425,6 +1425,9 @@ u32 si_pmu_alp_clock(si_t *sih) #ifdef BCMDBG char chn[8]; #endif + /* bail out with default */ + if (!PMUCTL_ENAB(sih)) + return clock; /* Remember original core before switch to chipc */ origidx = si_coreidx(sih);