watchdog: Convert comma to semicolon

[PATCH v1] watchdog: Convert comma to semicolon

Posted by Shen Lichuan 2 months, 3 weeks ago

To ensure code clarity and prevent potential errors, it's advisable
to employ the ';' as a statement separator, except when ',' are
intentionally used for specific purposes.

Signed-off-by: Shen Lichuan <shenlichuan@vivo.com>
---
 drivers/watchdog/iTCO_wdt.c   | 4 ++--
 drivers/watchdog/pm8916_wdt.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c
index 264857d314da..35b358bcf94c 100644
--- a/drivers/watchdog/iTCO_wdt.c
+++ b/drivers/watchdog/iTCO_wdt.c
@@ -563,8 +563,8 @@ static int iTCO_wdt_probe(struct platform_device *pdev)
 	}
 
 	ident.firmware_version = p->iTCO_version;
-	p->wddev.info = &ident,
-	p->wddev.ops = &iTCO_wdt_ops,
+	p->wddev.info = &ident;
+	p->wddev.ops = &iTCO_wdt_ops;
 	p->wddev.bootstatus = 0;
 	p->wddev.timeout = WATCHDOG_TIMEOUT;
 	watchdog_set_nowayout(&p->wddev, nowayout);
diff --git a/drivers/watchdog/pm8916_wdt.c b/drivers/watchdog/pm8916_wdt.c
index f3fcbeb0852c..007ed139ab96 100644
--- a/drivers/watchdog/pm8916_wdt.c
+++ b/drivers/watchdog/pm8916_wdt.c
@@ -218,7 +218,7 @@ static int pm8916_wdt_probe(struct platform_device *pdev)
 		return err;
 	}
 
-	wdt->wdev.ops = &pm8916_wdt_ops,
+	wdt->wdev.ops = &pm8916_wdt_ops;
 	wdt->wdev.parent = dev;
 	wdt->wdev.min_timeout = PM8916_WDT_MIN_TIMEOUT;
 	wdt->wdev.max_timeout = PM8916_WDT_MAX_TIMEOUT;
-- 
2.17.1

Re: [PATCH v1] watchdog: Convert comma to semicolon

Posted by Wim Van Sebroeck 2 months, 2 weeks ago

Hi Shen,

> To ensure code clarity and prevent potential errors, it's advisable
> to employ the ';' as a statement separator, except when ',' are
> intentionally used for specific purposes.
> 
> Signed-off-by: Shen Lichuan <shenlichuan@vivo.com>
> ---
>  drivers/watchdog/iTCO_wdt.c   | 4 ++--
>  drivers/watchdog/pm8916_wdt.c | 2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c
> index 264857d314da..35b358bcf94c 100644
> --- a/drivers/watchdog/iTCO_wdt.c
> +++ b/drivers/watchdog/iTCO_wdt.c
> @@ -563,8 +563,8 @@ static int iTCO_wdt_probe(struct platform_device *pdev)
>  	}
>  
>  	ident.firmware_version = p->iTCO_version;
> -	p->wddev.info = &ident,
> -	p->wddev.ops = &iTCO_wdt_ops,
> +	p->wddev.info = &ident;
> +	p->wddev.ops = &iTCO_wdt_ops;
>  	p->wddev.bootstatus = 0;
>  	p->wddev.timeout = WATCHDOG_TIMEOUT;
>  	watchdog_set_nowayout(&p->wddev, nowayout);

Removed this part since there was allready a patch for this that is in linux-watchdog-next.

> diff --git a/drivers/watchdog/pm8916_wdt.c b/drivers/watchdog/pm8916_wdt.c
> index f3fcbeb0852c..007ed139ab96 100644
> --- a/drivers/watchdog/pm8916_wdt.c
> +++ b/drivers/watchdog/pm8916_wdt.c
> @@ -218,7 +218,7 @@ static int pm8916_wdt_probe(struct platform_device *pdev)
>  		return err;
>  	}
>  
> -	wdt->wdev.ops = &pm8916_wdt_ops,
> +	wdt->wdev.ops = &pm8916_wdt_ops;
>  	wdt->wdev.parent = dev;
>  	wdt->wdev.min_timeout = PM8916_WDT_MIN_TIMEOUT;
>  	wdt->wdev.max_timeout = PM8916_WDT_MAX_TIMEOUT;
> -- 
> 2.17.1
> 

Reviewed-by: Wim Van Sebroeck <wim@linux-watchdog.org>

And added it to linux-watchdog-next also.

Kind regards,
Wim.