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 <brudley@broadcom.com>
Cc: Henry Ptasinski <henryp@broadcom.com>
Cc: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c
index 9f5ee40b2edb2b869e99664f4f83593029c53864..4e7a20aaa761a30ae44859b3674c7ba00854f747 100644 (file)
--- 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 ffa2e2d55d5826b7590f56d7ca25d45093b78460..566e0304cb8414ec8e36f100d54974f73dc4382f 100644 (file)
--- 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);