[PATCH] m68k: Fix the following checkpatch error:

zhangyongle001@208suo.com posted 1 patch 2 years, 6 months ago
arch/m68k/bvme6000/config.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
[PATCH] m68k: Fix the following checkpatch error:
Posted by zhangyongle001@208suo.com 2 years, 6 months ago
ERROR: that open brace { should be on the previous line
ERROR: that open brace { should be on the previous line
ERROR: else should follow close brace '}'

Signed-off-by: zhangyongle <zhangyongle001@208suo.com >
---
  arch/m68k/bvme6000/config.c | 7 ++-----
  1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/arch/m68k/bvme6000/config.c b/arch/m68k/bvme6000/config.c
index 3a1d90e399e0..6bc33d5d4d73 100644
--- a/arch/m68k/bvme6000/config.c
+++ b/arch/m68k/bvme6000/config.c
@@ -290,8 +290,7 @@ int bvme6000_hwclk(int op, struct rtc_time *t)

  	rtc->msr = 0x40;	/* Ensure clock and real-time-mode-register
  				 * are accessible */
-	if (op)
-	{	/* Write.... */
+	if (op) {	/* Write.... */
  		rtc->t0cr_rtmr = t->tm_year%4;
  		rtc->bcd_tenms = 0;
  		rtc->bcd_sec = bin2bcd(t->tm_sec);
@@ -303,9 +302,7 @@ int bvme6000_hwclk(int op, struct rtc_time *t)
  		if (t->tm_wday >= 0)
  			rtc->bcd_dow = bin2bcd(t->tm_wday+1);
  		rtc->t0cr_rtmr = t->tm_year%4 | 0x08;
-	}
-	else
-	{	/* Read....  */
+	} else {	/* Read....  */
  		do {
  			t->tm_sec  = bcd2bin(rtc->bcd_sec);
  			t->tm_min  = bcd2bin(rtc->bcd_min);
-- 
2.40.1
Re: [PATCH] m68k: Fix the following checkpatch error:
Posted by Geert Uytterhoeven 2 years, 6 months ago
Hi Zhangyong,

On Thu, Jul 20, 2023 at 11:50 AM <zhangyongle001@208suo.com> wrote:
> ERROR: that open brace { should be on the previous line
> ERROR: that open brace { should be on the previous line
> ERROR: else should follow close brace '}'
>
> Signed-off-by: zhangyongle <zhangyongle001@208suo.com >

Thanks for your patch!

But obviously you forgot to run scripts/checkpatch.pl on your own patch:

    WARNING: A patch subject line should describe the change not the
tool that found it
    #2:
    Subject: [PATCH] m68k: Fix the following checkpatch error:

    ERROR: Unrecognized email address: 'zhangyongle
<zhangyongle001@208suo.com >'
    #14:
    Signed-off-by: zhangyongle <zhangyongle001@208suo.com >

    WARNING: From:/Signed-off-by: email address mismatch: 'From:
zhangyongle001@208suo.com' != 'Signed-off-by: zhangyongle
<zhangyongle001@208suo.com >'

> --- a/arch/m68k/bvme6000/config.c
> +++ b/arch/m68k/bvme6000/config.c
> @@ -290,8 +290,7 @@ int bvme6000_hwclk(int op, struct rtc_time *t)
>
>         rtc->msr = 0x40;        /* Ensure clock and real-time-mode-register
>                                  * are accessible */
> -       if (op)
> -       {       /* Write.... */
> +       if (op) {       /* Write.... */
>                 rtc->t0cr_rtmr = t->tm_year%4;
>                 rtc->bcd_tenms = 0;
>                 rtc->bcd_sec = bin2bcd(t->tm_sec);
> @@ -303,9 +302,7 @@ int bvme6000_hwclk(int op, struct rtc_time *t)
>                 if (t->tm_wday >= 0)
>                         rtc->bcd_dow = bin2bcd(t->tm_wday+1);
>                 rtc->t0cr_rtmr = t->tm_year%4 | 0x08;
> -       }
> -       else
> -       {       /* Read....  */
> +       } else {        /* Read....  */
>                 do {
>                         t->tm_sec  = bcd2bin(rtc->bcd_sec);
>                         t->tm_min  = bcd2bin(rtc->bcd_min);

This patch is whitespace-damaged, and fails to apply.

These problems are present in all your patches, so something is
wrong in your workflow.  Please test your patches by running
scripts/checkpatch.pl, emailing them to yourself, and trying to
apply them.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds