2021-07-23 18:29:30

by Pankaj Gupta

Subject: [PATCH] cpuidle: set poll_limit_ns out of if-else

From: Pankaj Gupta <[email protected]>

Since poll_limit_ns is being set at the end of both if and else statement.
Moving and setting it out at one place.

Signed-off-by: Pankaj Gupta <[email protected]>
---
drivers/cpuidle/governors/haltpoll.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/cpuidle/governors/haltpoll.c b/drivers/cpuidle/governors/haltpoll.c
index cb2a96eafc02..7d0e95bc94f3 100644
--- a/drivers/cpuidle/governors/haltpoll.c
+++ b/drivers/cpuidle/governors/haltpoll.c
@@ -90,7 +90,6 @@ static void adjust_poll_limit(struct cpuidle_device *dev, u64 block_ns)
if (val > guest_halt_poll_ns)
val = guest_halt_poll_ns;

- dev->poll_limit_ns = val;
} else if (block_ns > guest_halt_poll_ns &&
guest_halt_poll_allow_shrink) {
unsigned int shrink = guest_halt_poll_shrink;
@@ -100,8 +99,9 @@ static void adjust_poll_limit(struct cpuidle_device *dev, u64 block_ns)
val = 0;
else
val /= shrink;
- dev->poll_limit_ns = val;
}
+
+ dev->poll_limit_ns = val;
}

/**
--
2.25.1

2021-08-04 17:24:35

by Rafael J. Wysocki

Subject: Re: [PATCH] cpuidle: set poll_limit_ns out of if-else

On Fri, Jul 23, 2021 at 8:28 PM Pankaj Gupta
<[email protected]> wrote:
>
> From: Pankaj Gupta <[email protected]>
>
> Since poll_limit_ns is being set at the end of both if and else statement.

But they are if () and else if (), so not really.

> Moving and setting it out at one place.
>
> Signed-off-by: Pankaj Gupta <[email protected]>
> ---
> drivers/cpuidle/governors/haltpoll.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/cpuidle/governors/haltpoll.c b/drivers/cpuidle/governors/haltpoll.c
> index cb2a96eafc02..7d0e95bc94f3 100644
> --- a/drivers/cpuidle/governors/haltpoll.c
> +++ b/drivers/cpuidle/governors/haltpoll.c
> @@ -90,7 +90,6 @@ static void adjust_poll_limit(struct cpuidle_device *dev, u64 block_ns)
> if (val > guest_halt_poll_ns)
> val = guest_halt_poll_ns;
>
> - dev->poll_limit_ns = val;
> } else if (block_ns > guest_halt_poll_ns &&
> guest_halt_poll_allow_shrink) {
> unsigned int shrink = guest_halt_poll_shrink;
> @@ -100,8 +99,9 @@ static void adjust_poll_limit(struct cpuidle_device *dev, u64 block_ns)
> val = 0;
> else
> val /= shrink;
> - dev->poll_limit_ns = val;
> }
> +
> + dev->poll_limit_ns = val;
> }
>
> /**
> --
> 2.25.1
>

2021-08-04 20:48:37

by Pankaj Gupta

Subject: Re: [PATCH] cpuidle: set poll_limit_ns out of if-else

> <[email protected]> wrote:
> >
> > From: Pankaj Gupta <[email protected]>
> >
> > Since poll_limit_ns is being set at the end of both if and else statement.
>
> But they are if () and else if (), so not really.

So sorry!

Thanks,
Pankaj