diff options
| author | Arend van Spriel <arend@broadcom.com> | 2011-05-03 11:35:36 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-05-03 12:42:40 -0700 |
| commit | 7754116bab5b69491dbb6eb320e59b244624df63 (patch) | |
| tree | 90d9823303fb324be8fa4b2f256e852e188d84a8 /drivers/staging | |
| parent | da065a5c524c0ea2589d12f69884b2f8305dc6d4 (diff) | |
| download | kernel_samsung_smdk4412-7754116bab5b69491dbb6eb320e59b244624df63.zip kernel_samsung_smdk4412-7754116bab5b69491dbb6eb320e59b244624df63.tar.gz kernel_samsung_smdk4412-7754116bab5b69491dbb6eb320e59b244624df63.tar.bz2 | |
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>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c | 2 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/util/hndpmu.c | 3 |
2 files changed, 4 insertions, 1 deletions
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); |