[PATCH] m68k/q40: Fix syntax error

[PATCH] m68k/q40: Fix syntax error

[wuyonggang001]

Fix the following checkpatch error:

ERROR: space required after that ',' (ctx:VxV)
ERROR: spaces required around that '<' (ctx:VxV)

Signed-off-by: Yonggang Wu <wuyonggang001@208suo.com>
---
  arch/m68k/q40/config.c | 18 +++++++++---------
  1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/arch/m68k/q40/config.c b/arch/m68k/q40/config.c
index c78ee709b458..79670d670ffb 100644
--- a/arch/m68k/q40/config.c
+++ b/arch/m68k/q40/config.c
@@ -148,12 +148,12 @@ static void q40_get_model(char *model)

  static unsigned int serports[] =
  {
-    0x3f8,0x2f8,0x3e8,0x2e8,0
+    0x3f8, 0x2f8, 0x3e8, 0x2e8, 0
  };

  static void __init q40_disable_irqs(void)
  {
-    unsigned i, j;
+    unsigned int i, j;

      j = 0;
      while ((i = serports[j++]))
@@ -227,12 +227,12 @@ static int q40_hwclk(int op, struct rtc_time *t)
          /* Read....  */
          Q40_RTC_CTRL |= Q40_RTC_READ;

-        t->tm_year = bcd2bin (Q40_RTC_YEAR);
-        t->tm_mon  = bcd2bin (Q40_RTC_MNTH)-1;
-        t->tm_mday = bcd2bin (Q40_RTC_DATE);
-        t->tm_hour = bcd2bin (Q40_RTC_HOUR);
-        t->tm_min  = bcd2bin (Q40_RTC_MINS);
-        t->tm_sec  = bcd2bin (Q40_RTC_SECS);
+        t->tm_year = bcd2bin(Q40_RTC_YEAR);
+        t->tm_mon  = bcd2bin(Q40_RTC_MNTH)-1;
+        t->tm_mday = bcd2bin(Q40_RTC_DATE);
+        t->tm_hour = bcd2bin(Q40_RTC_HOUR);
+        t->tm_min  = bcd2bin(Q40_RTC_MINS);
+        t->tm_sec  = bcd2bin(Q40_RTC_SECS);

          Q40_RTC_CTRL &= ~(Q40_RTC_READ);

@@ -270,7 +270,7 @@ static int q40_set_rtc_pll(struct rtc_pll_info *pll)
      if (!pll->pll_ctrl) {
          /* the docs are a bit unclear so I am doublesetting */
          /* RTC_WRITE here ... */
-        int tmp = (pll->pll_value & 31) | (pll->pll_value<0 ? 32 : 0) |
+        int tmp = (pll->pll_value & 31) | (pll->pll_value < 0 ? 32 : 0) 
|
                Q40_RTC_WRITE;
          Q40_RTC_CTRL |= Q40_RTC_WRITE;
          Q40_RTC_CTRL = tmp;

Re: [PATCH] m68k/q40: Fix syntax error

[Geert Uytterhoeven]

Hi Yonggang,

Thanks for your patch!

On Wed, Jun 14, 2023 at 8:16 AM <wuyonggang001@208suo.com> wrote:
>
> Fix the following checkpatch error:

The patch subject does not match the description.

>
> ERROR: space required after that ',' (ctx:VxV)
> ERROR: spaces required around that '<' (ctx:VxV)
>
> Signed-off-by: Yonggang Wu <wuyonggang001@208suo.com>

scripts/checkpatch.pl says:

    WARNING: From:/Signed-off-by: email name mismatch: 'From:
wuyonggang001@208suo.com' != 'Signed-off-by: Yonggang Wu
<wuyonggang001@208suo.com>'

> --- a/arch/m68k/q40/config.c
> +++ b/arch/m68k/q40/config.c

> @@ -270,7 +270,7 @@ static int q40_set_rtc_pll(struct rtc_pll_info *pll)
>       if (!pll->pll_ctrl) {
>           /* the docs are a bit unclear so I am doublesetting */
>           /* RTC_WRITE here ... */
> -        int tmp = (pll->pll_value & 31) | (pll->pll_value<0 ? 32 : 0) |
> +        int tmp = (pll->pll_value & 31) | (pll->pll_value < 0 ? 32 : 0)
> |

ERROR: patch seems to be corrupt (line wrapped?)

>                 Q40_RTC_WRITE;
>           Q40_RTC_CTRL |= Q40_RTC_WRITE;
>           Q40_RTC_CTRL = tmp;


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