Commit 41fa8f57 authored by Philipp Zabel's avatar Philipp Zabel Committed by Thierry Reding

pwm: stm32: Use hweight32 in stm32_pwm_detect_channels

Use hweight32() to count the CCxE bits in stm32_pwm_detect_channels().
Since the return value is assigned to chip.npwm, change it to unsigned
int as well.
Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: default avatarFabrice Gasnier <fabrice.gasnier@foss.st.com>
Signed-off-by: default avatarThierry Reding <thierry.reding@gmail.com>
parent c0504f59
...@@ -563,10 +563,9 @@ static void stm32_pwm_detect_complementary(struct stm32_pwm *priv) ...@@ -563,10 +563,9 @@ static void stm32_pwm_detect_complementary(struct stm32_pwm *priv)
priv->have_complementary_output = (ccer != 0); priv->have_complementary_output = (ccer != 0);
} }
static int stm32_pwm_detect_channels(struct stm32_pwm *priv) static unsigned int stm32_pwm_detect_channels(struct stm32_pwm *priv)
{ {
u32 ccer; u32 ccer;
int npwm = 0;
/* /*
* If channels enable bits don't exist writing 1 will have no * If channels enable bits don't exist writing 1 will have no
...@@ -576,19 +575,7 @@ static int stm32_pwm_detect_channels(struct stm32_pwm *priv) ...@@ -576,19 +575,7 @@ static int stm32_pwm_detect_channels(struct stm32_pwm *priv)
regmap_read(priv->regmap, TIM_CCER, &ccer); regmap_read(priv->regmap, TIM_CCER, &ccer);
regmap_clear_bits(priv->regmap, TIM_CCER, TIM_CCER_CCXE); regmap_clear_bits(priv->regmap, TIM_CCER, TIM_CCER_CCXE);
if (ccer & TIM_CCER_CC1E) return hweight32(ccer & TIM_CCER_CCXE);
npwm++;
if (ccer & TIM_CCER_CC2E)
npwm++;
if (ccer & TIM_CCER_CC3E)
npwm++;
if (ccer & TIM_CCER_CC4E)
npwm++;
return npwm;
} }
static int stm32_pwm_probe(struct platform_device *pdev) static int stm32_pwm_probe(struct platform_device *pdev)
......
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