Skip to content

Commit

Permalink
staging: brcm80211: fix checkpatch issues in si_pmu_measure_alpclk
Browse files Browse the repository at this point in the history
Patch "remove dependency between aiutils and siutils sources" introduced
several checkpatch warnings. This patch removes those in the function
si_pmu_measure_alpclk().

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>
  • Loading branch information
Arend van Spriel authored and Greg Kroah-Hartman committed May 3, 2011
1 parent 2d1a826 commit aa4eec9
Showing 1 changed file with 12 additions and 3 deletions.
15 changes: 12 additions & 3 deletions drivers/staging/brcm80211/brcmsmac/wlc_pmu.c
Original file line number Diff line number Diff line change
Expand Up @@ -1792,7 +1792,10 @@ u32 si_pmu_measure_alpclk(si_t *sih)
if (R_REG(&cc->pmustatus) & PST_EXTLPOAVAIL) {
u32 ilp_ctr, alp_hz;

/* Enable the reg to measure the freq, in case disabled before */
/*
* Enable the reg to measure the freq,
* in case it was disabled before
*/
W_REG(&cc->pmu_xtalfreq,
1U << PMU_XTALFREQ_REG_MEASURE_SHIFT);

Expand All @@ -1803,13 +1806,19 @@ u32 si_pmu_measure_alpclk(si_t *sih)
ilp_ctr =
R_REG(&cc->pmu_xtalfreq) & PMU_XTALFREQ_REG_ILPCTR_MASK;

/* Turn off the PMU_XTALFREQ_REG_MEASURE_SHIFT bit to save power */
/*
* Turn off the PMU_XTALFREQ_REG_MEASURE_SHIFT
* bit to save power
*/
W_REG(&cc->pmu_xtalfreq, 0);

/* Calculate ALP frequency */
alp_hz = (ilp_ctr * EXT_ILP_HZ) / 4;

/* Round to nearest 100KHz, and at the same time convert to KHz */
/*
* Round to nearest 100KHz, and at
* the same time convert to KHz
*/
alp_khz = (alp_hz + 50000) / 100000 * 100;
} else
alp_khz = 0;
Expand Down

0 comments on commit aa4eec9

Please sign in to comment.