| Message ID | 20241115-converge-secs-to-jiffies-v2-5-911fb7595e79@linux.microsoft.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v2,01/21] netfilter: conntrack: Cleanup timeout definitions | expand |
On Sat, Nov 16, 2024 at 11:06:55AM +0100, Christophe Leroy wrote: > > diff --git a/arch/powerpc/platforms/pseries/papr_scm.c b/arch/powerpc/platforms/pseries/papr_scm.c > > index 9e297f88adc5d97d4dc7b267b0bfebd58e5cf193..9e8086ec66e0f0e555ac27933854c06cfcf91a04 100644 > > --- a/arch/powerpc/platforms/pseries/papr_scm.c > > +++ b/arch/powerpc/platforms/pseries/papr_scm.c > > @@ -543,7 +543,7 @@ static int drc_pmem_query_health(struct papr_scm_priv *p) > > > > /* Jiffies offset for which the health data is assumed to be same */ > > cache_timeout = p->lasthealth_jiffies + > > - msecs_to_jiffies(MIN_HEALTH_QUERY_INTERVAL * 1000); > > + secs_to_jiffies(MIN_HEALTH_QUERY_INTERVAL); > > Wouldn't it now fit on a single line ? > Some maintainers still prefer to put a line break at 80 characters. It's kind of a nightmare for an automated script like this to figure out everyone's preferences. In this particular file, there are some lines which go over 80 characters so sure. Earlier in the patchset one of these introduced a line break that wasn't there before so I think maybe Coccinelle is applying the 80 character line break rule? There are sometimes where the 80 character rule really hurts readability, but here it doesn't make any difference. regards, dan carpenter
diff --git a/arch/powerpc/platforms/pseries/papr_scm.c b/arch/powerpc/platforms/pseries/papr_scm.c index 9e297f88adc5d97d4dc7b267b0bfebd58e5cf193..9e8086ec66e0f0e555ac27933854c06cfcf91a04 100644 --- a/arch/powerpc/platforms/pseries/papr_scm.c +++ b/arch/powerpc/platforms/pseries/papr_scm.c @@ -543,7 +543,7 @@ static int drc_pmem_query_health(struct papr_scm_priv *p) /* Jiffies offset for which the health data is assumed to be same */ cache_timeout = p->lasthealth_jiffies + - msecs_to_jiffies(MIN_HEALTH_QUERY_INTERVAL * 1000); + secs_to_jiffies(MIN_HEALTH_QUERY_INTERVAL); /* Fetch new health info is its older than MIN_HEALTH_QUERY_INTERVAL */ if (time_after(jiffies, cache_timeout))
Changes made with the following Coccinelle rules: @@ constant C; @@ - msecs_to_jiffies(C * 1000) + secs_to_jiffies(C) @@ constant C; @@ - msecs_to_jiffies(C * MSEC_PER_SEC) + secs_to_jiffies(C) Signed-off-by: Easwar Hariharan <eahariha@linux.microsoft.com> --- arch/powerpc/platforms/pseries/papr_scm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)