linux-kernel - Re: [PATCH 21/27] watchdog: bcm281xx: Remove use of seq

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Fri, 27 Mar 2015 08:57:03 +0100
From:	Wim Van Sebroeck <wim@...ana.be>
To:	Joe Perches <joe@...ches.com>
Cc:	Andrew Morton <akpm@...ux-foundation.org>,
	linux-watchdog@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH 21/27] watchdog: bcm281xx: Remove use of seq_printf return value

Hi Joe,

> The seq_printf return value, because it's frequently misused,
> will eventually be converted to void.
> 
> See: commit 1f33c41c03da ("seq_file: Rename seq_overflow() to
>      seq_has_overflowed() and make public")
> 
> Signed-off-by: Joe Perches <joe@...ches.com>
> ---
>  drivers/watchdog/bcm_kona_wdt.c | 27 ++++++++++++++++-----------
>  1 file changed, 16 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/watchdog/bcm_kona_wdt.c b/drivers/watchdog/bcm_kona_wdt.c
> index 4e37db3..22d8ae6 100644
> --- a/drivers/watchdog/bcm_kona_wdt.c
> +++ b/drivers/watchdog/bcm_kona_wdt.c
> @@ -99,12 +99,14 @@ static int secure_register_read(struct bcm_kona_wdt *wdt, uint32_t offset)
>  
>  static int bcm_kona_wdt_dbg_show(struct seq_file *s, void *data)
>  {
> -	int ctl_val, cur_val, ret;
> +	int ctl_val, cur_val;
>  	unsigned long flags;
>  	struct bcm_kona_wdt *wdt = s->private;
>  
> -	if (!wdt)
> -		return seq_puts(s, "No device pointer\n");
> +	if (!wdt) {
> +		seq_puts(s, "No device pointer\n");
> +		return 0;
> +	}
>  
>  	spin_lock_irqsave(&wdt->lock, flags);
>  	ctl_val = secure_register_read(wdt, SECWDOG_CTRL_REG);
> @@ -112,7 +114,7 @@ static int bcm_kona_wdt_dbg_show(struct seq_file *s, void *data)
>  	spin_unlock_irqrestore(&wdt->lock, flags);
>  
>  	if (ctl_val < 0 || cur_val < 0) {
> -		ret = seq_puts(s, "Error accessing hardware\n");
> +		seq_puts(s, "Error accessing hardware\n");
>  	} else {
>  		int ctl, cur, ctl_sec, cur_sec, res;
>  
> @@ -121,15 +123,18 @@ static int bcm_kona_wdt_dbg_show(struct seq_file *s, void *data)
>  		cur = cur_val & SECWDOG_COUNT_MASK;
>  		ctl_sec = TICKS_TO_SECS(ctl, wdt);
>  		cur_sec = TICKS_TO_SECS(cur, wdt);
> -		ret = seq_printf(s, "Resolution: %d / %d\n"
> -				"Control: %d s / %d (%#x) ticks\n"
> -				"Current: %d s / %d (%#x) ticks\n"
> -				"Busy count: %lu\n", res,
> -				wdt->resolution, ctl_sec, ctl, ctl, cur_sec,
> -				cur, cur, wdt->busy_count);
> +		seq_printf(s,
> +			   "Resolution: %d / %d\n"
> +			   "Control: %d s / %d (%#x) ticks\n"
> +			   "Current: %d s / %d (%#x) ticks\n"
> +			   "Busy count: %lu\n",
> +			   res, wdt->resolution,
> +			   ctl_sec, ctl, ctl,
> +			   cur_sec, cur, cur,
> +			   wdt->busy_count);
>  	}
>  
> -	return ret;
> +	return 0;
>  }
>  
>  static int bcm_kona_dbg_open(struct inode *inode, struct file *file)
> -- 
> 2.1.2

This patch was applied to linux-watchdog-next.

Kind regards,
Wim.

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/