Commit aa4eec93 authored by Arend van Spriel's avatar Arend van Spriel Committed by Greg Kroah-Hartman

staging: brcm80211: fix checkpatch issues in si_pmu_measure_alpclk

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: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 2d1a826d
...@@ -1792,7 +1792,10 @@ u32 si_pmu_measure_alpclk(si_t *sih) ...@@ -1792,7 +1792,10 @@ u32 si_pmu_measure_alpclk(si_t *sih)
if (R_REG(&cc->pmustatus) & PST_EXTLPOAVAIL) { if (R_REG(&cc->pmustatus) & PST_EXTLPOAVAIL) {
u32 ilp_ctr, alp_hz; 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, W_REG(&cc->pmu_xtalfreq,
1U << PMU_XTALFREQ_REG_MEASURE_SHIFT); 1U << PMU_XTALFREQ_REG_MEASURE_SHIFT);
...@@ -1803,13 +1806,19 @@ u32 si_pmu_measure_alpclk(si_t *sih) ...@@ -1803,13 +1806,19 @@ u32 si_pmu_measure_alpclk(si_t *sih)
ilp_ctr = ilp_ctr =
R_REG(&cc->pmu_xtalfreq) & PMU_XTALFREQ_REG_ILPCTR_MASK; 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); W_REG(&cc->pmu_xtalfreq, 0);
/* Calculate ALP frequency */ /* Calculate ALP frequency */
alp_hz = (ilp_ctr * EXT_ILP_HZ) / 4; 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; alp_khz = (alp_hz + 50000) / 100000 * 100;
} else } else
alp_khz = 0; alp_khz = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment