Re: [PATCH] aic79xx: fix misuse of static variables

[Hannes Reinecke <hare@suse.de>]

On 03/30/2014 03:30 PM, Mathias Krause wrote:
> The format strings for various printk()s make use of a temporary
> variable that is declared 'static'. This is probably not intended,
> so fix those.
> 
> Found in the PaX patch, written by the PaX Team.
> 
> Cc: PaX Team <pageexec@freemail.hu>
> Cc: Hannes Reinecke <hare@suse.de>
> Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
> Signed-off-by: Mathias Krause <minipli@googlemail.com>
> ---
> 
> Remark: Compile tested only! I've no such hardware.
> 
>  drivers/scsi/aic7xxx/aic79xx_pci.c |   18 +++++-------------
>  1 file changed, 5 insertions(+), 13 deletions(-)
> 
> diff --git a/drivers/scsi/aic7xxx/aic79xx_pci.c b/drivers/scsi/aic7xxx/aic79xx_pci.c
> index 14b5f8d0e7..cc9bd26f5d 100644
> --- a/drivers/scsi/aic7xxx/aic79xx_pci.c
> +++ b/drivers/scsi/aic7xxx/aic79xx_pci.c
> @@ -827,7 +827,7 @@ ahd_pci_intr(struct ahd_softc *ahd)
>  		for (bit = 0; bit < 8; bit++) {
>  
>  			if ((pci_status[i] & (0x1 << bit)) != 0) {
> -				static const char *s;
> +				const char *s;
>  
>  				s = pci_status_strings[bit];
>  				if (i == 7/*TARG*/ && bit == 3)
> @@ -887,23 +887,15 @@ ahd_pci_split_intr(struct ahd_softc *ahd, u_int intstat)
>  
>  		for (bit = 0; bit < 8; bit++) {
>  
> -			if ((split_status[i] & (0x1 << bit)) != 0) {
> -				static const char *s;
> -
> -				s = split_status_strings[bit];
> -				printk(s, ahd_name(ahd),
> +			if ((split_status[i] & (0x1 << bit)) != 0)
> +				printk(split_status_strings[bit], ahd_name(ahd),
>  				       split_status_source[i]);
> -			}
>  
>  			if (i > 1)
>  				continue;
>  
> -			if ((sg_split_status[i] & (0x1 << bit)) != 0) {
> -				static const char *s;
> -
> -				s = split_status_strings[bit];
> -				printk(s, ahd_name(ahd), "SG");
> -			}
> +			if ((sg_split_status[i] & (0x1 << bit)) != 0)
> +				printk(split_status_strings[bit], ahd_name(ahd), "SG");
>  		}
>  	}
>  	/*
> 
Looks good.

Acked-by: Hannes Reinecke <hare@suse.de>

Cheers,

Hannes
-- 
Dr. Hannes Reinecke		      zSeries & Storage
hare@suse.de			      +49 911 74053 688
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: J. Hawn, J. Guild, F. Imendörffer, HRB 16746 (AG Nürnberg)
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html