2021-06-15 11:55:50

by Jiabing Wan

Subject: [PATCH] clocksource: Remove duplicated argument in arm_global_timer

Fix the following coccicheck warning:
drivers/clocksource/arm_global_timer.c:107:4-23:
duplicated argument to & or |

Signed-off-by: Wan Jiabing <[email protected]>
---
drivers/clocksource/arm_global_timer.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/clocksource/arm_global_timer.c b/drivers/clocksource/arm_global_timer.c
index 60a8047fd32e..fdf32a0c86d1 100644
--- a/drivers/clocksource/arm_global_timer.c
+++ b/drivers/clocksource/arm_global_timer.c
@@ -104,7 +104,7 @@ static void gt_compare_set(unsigned long delta, int periodic)
counter += delta;
ctrl = readl(gt_base + GT_CONTROL);
ctrl &= ~(GT_CONTROL_COMP_ENABLE | GT_CONTROL_IRQ_ENABLE |
- GT_CONTROL_AUTO_INC | GT_CONTROL_AUTO_INC);
+ GT_CONTROL_AUTO_INC);
ctrl |= GT_CONTROL_TIMER_ENABLE;
writel_relaxed(ctrl, gt_base + GT_CONTROL);
writel_relaxed(lower_32_bits(counter), gt_base + GT_COMP0);
--
2.20.1

2021-06-15 14:04:19

by Patrice CHOTARD

Subject: Re: [PATCH] clocksource: Remove duplicated argument in arm_global_timer

Hi Wan

On 6/15/21 1:54 PM, Wan Jiabing wrote:
> Fix the following coccicheck warning:
> drivers/clocksource/arm_global_timer.c:107:4-23:
> duplicated argument to & or |
>
> Signed-off-by: Wan Jiabing <[email protected]>
> ---
> drivers/clocksource/arm_global_timer.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/clocksource/arm_global_timer.c b/drivers/clocksource/arm_global_timer.c
> index 60a8047fd32e..fdf32a0c86d1 100644
> --- a/drivers/clocksource/arm_global_timer.c
> +++ b/drivers/clocksource/arm_global_timer.c
> @@ -104,7 +104,7 @@ static void gt_compare_set(unsigned long delta, int periodic)
> counter += delta;
> ctrl = readl(gt_base + GT_CONTROL);
> ctrl &= ~(GT_CONTROL_COMP_ENABLE | GT_CONTROL_IRQ_ENABLE |
> - GT_CONTROL_AUTO_INC | GT_CONTROL_AUTO_INC);
> + GT_CONTROL_AUTO_INC);
> ctrl |= GT_CONTROL_TIMER_ENABLE;
> writel_relaxed(ctrl, gt_base + GT_CONTROL);
> writel_relaxed(lower_32_bits(counter), gt_base + GT_COMP0);
>

Reviewed-by: Patrice Chotard <[email protected]>
Thanks
Patrice

2021-06-18 18:32:52

by tip-bot2 for Alexey Makhalov

Subject: [tip: timers/core] clocksource/drivers/arm_global_timer: Remove duplicated argument in arm_global_timer

The following commit has been merged into the timers/core branch of tip:

Commit-ID: f94bc2667fb204d7c131ac39d9ea342bd16116dc
Gitweb: https://git.kernel.org/tip/f94bc2667fb204d7c131ac39d9ea342bd16116dc
Author: Wan Jiabing <[email protected]>
AuthorDate: Tue, 15 Jun 2021 19:54:40 +08:00
Committer: Daniel Lezcano <[email protected]>
CommitterDate: Wed, 16 Jun 2021 17:33:04 +02:00

clocksource/drivers/arm_global_timer: Remove duplicated argument in arm_global_timer

Fix the following coccicheck warning:

drivers/clocksource/arm_global_timer.c:107:4-23:
duplicated argument to & or |

Signed-off-by: Wan Jiabing <[email protected]>
Reviewed-by: Patrice Chotard <[email protected]>
Signed-off-by: Daniel Lezcano <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
---
drivers/clocksource/arm_global_timer.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/clocksource/arm_global_timer.c b/drivers/clocksource/arm_global_timer.c
index 68b1d14..44a61dc 100644
--- a/drivers/clocksource/arm_global_timer.c
+++ b/drivers/clocksource/arm_global_timer.c
@@ -104,7 +104,7 @@ static void gt_compare_set(unsigned long delta, int periodic)
counter += delta;
ctrl = readl(gt_base + GT_CONTROL);
ctrl &= ~(GT_CONTROL_COMP_ENABLE | GT_CONTROL_IRQ_ENABLE |
- GT_CONTROL_AUTO_INC | GT_CONTROL_AUTO_INC);
+ GT_CONTROL_AUTO_INC);
ctrl |= GT_CONTROL_TIMER_ENABLE;
writel_relaxed(ctrl, gt_base + GT_CONTROL);
writel_relaxed(lower_32_bits(counter), gt_base + GT_COMP0);