2019-09-26 09:27:26

by Colin King

Subject: [PATCH] counter: stm32: clean up indentation issue

From: Colin Ian King <[email protected]>

There is an if statement that is indented one level too deeply,
remove the extraneous tabs.

Signed-off-by: Colin Ian King <[email protected]>
---
drivers/counter/stm32-timer-cnt.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/counter/stm32-timer-cnt.c b/drivers/counter/stm32-timer-cnt.c
index 644ba18a72ad..613dcccf79e1 100644
--- a/drivers/counter/stm32-timer-cnt.c
+++ b/drivers/counter/stm32-timer-cnt.c
@@ -219,8 +219,8 @@ static ssize_t stm32_count_enable_write(struct counter_device *counter,

if (enable) {
regmap_read(priv->regmap, TIM_CR1, &cr1);
- if (!(cr1 & TIM_CR1_CEN))
- clk_enable(priv->clk);
+ if (!(cr1 & TIM_CR1_CEN))
+ clk_enable(priv->clk);

regmap_update_bits(priv->regmap, TIM_CR1, TIM_CR1_CEN,
TIM_CR1_CEN);
--
2.20.1

2019-10-05 17:34:18

by William Breathitt Gray

Subject: Re: [PATCH] counter: stm32: clean up indentation issue

On Wed, Sep 25, 2019 at 10:51:26AM +0100, Colin King wrote:
> From: Colin Ian King <[email protected]>
>
> There is an if statement that is indented one level too deeply,
> remove the extraneous tabs.
>
> Signed-off-by: Colin Ian King <[email protected]>
> ---
> drivers/counter/stm32-timer-cnt.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/counter/stm32-timer-cnt.c b/drivers/counter/stm32-timer-cnt.c
> index 644ba18a72ad..613dcccf79e1 100644
> --- a/drivers/counter/stm32-timer-cnt.c
> +++ b/drivers/counter/stm32-timer-cnt.c
> @@ -219,8 +219,8 @@ static ssize_t stm32_count_enable_write(struct counter_device *counter,
>
> if (enable) {
> regmap_read(priv->regmap, TIM_CR1, &cr1);
> - if (!(cr1 & TIM_CR1_CEN))
> - clk_enable(priv->clk);
> + if (!(cr1 & TIM_CR1_CEN))
> + clk_enable(priv->clk);
>
> regmap_update_bits(priv->regmap, TIM_CR1, TIM_CR1_CEN,
> TIM_CR1_CEN);
> --
> 2.20.1

Acked-by: William Breathitt Gray <[email protected]>

Fabrice,

I noticed the TIM_CR1_CEN check is happening before the
regmap_update_bits call for the enable path, while the disable path does
the check after. Is this logic is correct.

William Breathitt Gray

2019-10-06 08:47:05

by Jonathan Cameron

Subject: Re: [PATCH] counter: stm32: clean up indentation issue

On Sat, 5 Oct 2019 13:30:04 -0400
William Breathitt Gray <[email protected]> wrote:

> On Wed, Sep 25, 2019 at 10:51:26AM +0100, Colin King wrote:
> > From: Colin Ian King <[email protected]>
> >
> > There is an if statement that is indented one level too deeply,
> > remove the extraneous tabs.
> >
> > Signed-off-by: Colin Ian King <[email protected]>
> > ---
> > drivers/counter/stm32-timer-cnt.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/counter/stm32-timer-cnt.c b/drivers/counter/stm32-timer-cnt.c
> > index 644ba18a72ad..613dcccf79e1 100644
> > --- a/drivers/counter/stm32-timer-cnt.c
> > +++ b/drivers/counter/stm32-timer-cnt.c
> > @@ -219,8 +219,8 @@ static ssize_t stm32_count_enable_write(struct counter_device *counter,
> >
> > if (enable) {
> > regmap_read(priv->regmap, TIM_CR1, &cr1);
> > - if (!(cr1 & TIM_CR1_CEN))
> > - clk_enable(priv->clk);
> > + if (!(cr1 & TIM_CR1_CEN))
> > + clk_enable(priv->clk);
> >
> > regmap_update_bits(priv->regmap, TIM_CR1, TIM_CR1_CEN,
> > TIM_CR1_CEN);
> > --
> > 2.20.1
>
> Acked-by: William Breathitt Gray <[email protected]>
Applied to the togreg branch of iio.git and pushed out as testing
for the autobuilders to poke it.

Thanks,

Jonathan

>
> Fabrice,
>
> I noticed the TIM_CR1_CEN check is happening before the
> regmap_update_bits call for the enable path, while the disable path does
> the check after. Is this logic is correct.
>
> William Breathitt Gray

2019-10-07 07:34:13

by Fabrice Gasnier

Subject: Re: [PATCH] counter: stm32: clean up indentation issue

On 10/5/19 7:30 PM, William Breathitt Gray wrote:
> On Wed, Sep 25, 2019 at 10:51:26AM +0100, Colin King wrote:
>> From: Colin Ian King <[email protected]>
>>
>> There is an if statement that is indented one level too deeply,
>> remove the extraneous tabs.
>>
>> Signed-off-by: Colin Ian King <[email protected]>
>> ---
>> drivers/counter/stm32-timer-cnt.c | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/counter/stm32-timer-cnt.c b/drivers/counter/stm32-timer-cnt.c
>> index 644ba18a72ad..613dcccf79e1 100644
>> --- a/drivers/counter/stm32-timer-cnt.c
>> +++ b/drivers/counter/stm32-timer-cnt.c
>> @@ -219,8 +219,8 @@ static ssize_t stm32_count_enable_write(struct counter_device *counter,
>>
>> if (enable) {
>> regmap_read(priv->regmap, TIM_CR1, &cr1);
>> - if (!(cr1 & TIM_CR1_CEN))
>> - clk_enable(priv->clk);
>> + if (!(cr1 & TIM_CR1_CEN))
>> + clk_enable(priv->clk);
>>
>> regmap_update_bits(priv->regmap, TIM_CR1, TIM_CR1_CEN,
>> TIM_CR1_CEN);
>> --
>> 2.20.1
>
> Acked-by: William Breathitt Gray <[email protected]>
>
> Fabrice,
>
> I noticed the TIM_CR1_CEN check is happening before the
> regmap_update_bits call for the enable path, while the disable path does
> the check after. Is this logic is correct.

Hi William,

In the disable path, things are done in the reverse order, purpose is to:
- enable the clock before enabling the counter (CEN)
- disable the clock after the counter has been disabled
Current code also takes care of balancing clock enable/disable calls.

BR,
Fabrice
>
> William Breathitt Gray
>