| Message ID | 20190925095126.20219-1-colin.king@canonical.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 76510ec692c88ee865ebb32bb77b1ee294fee89e |
| Headers | show |
| Series | counter: stm32: clean up indentation issue | expand |
On Wed, Sep 25, 2019 at 10:51:26AM +0100, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > There is an if statement that is indented one level too deeply, > remove the extraneous tabs. > > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > 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 <vilhelm.gray@gmail.com> 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
On Sat, 5 Oct 2019 13:30:04 -0400 William Breathitt Gray <vilhelm.gray@gmail.com> wrote: > On Wed, Sep 25, 2019 at 10:51:26AM +0100, Colin King wrote: > > From: Colin Ian King <colin.king@canonical.com> > > > > There is an if statement that is indented one level too deeply, > > remove the extraneous tabs. > > > > Signed-off-by: Colin Ian King <colin.king@canonical.com> > > --- > > 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 <vilhelm.gray@gmail.com> 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
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 <colin.king@canonical.com> >> >> There is an if statement that is indented one level too deeply, >> remove the extraneous tabs. >> >> Signed-off-by: Colin Ian King <colin.king@canonical.com> >> --- >> 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 <vilhelm.gray@gmail.com> > > 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 >
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);