[ofa-general] Re: [RFC PATCH 08/14] RFC IB/ipath: Fix sparse warning about shadowed symbol

[Arthur Jones]

thanks!

Acked-by: Arthur Jones <arthur.jones at qlogic.com>

On Fri, Feb 29, 2008 at 08:26:03PM -0800, Roland Dreier wrote:
> Fix
> 
>     drivers/infiniband/hw/ipath/ipath_init_chip.c:526:10: warning: symbol 'val' shadows an earlier one
>     drivers/infiniband/hw/ipath/ipath_init_chip.c:473:6: originally declared here
> 
> by giving the second val a different name.
> 
> Signed-off-by: Roland Dreier <rolandd at cisco.com>
> ---
>  drivers/infiniband/hw/ipath/ipath_init_chip.c |    8 ++++----
>  1 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/infiniband/hw/ipath/ipath_init_chip.c b/drivers/infiniband/hw/ipath/ipath_init_chip.c
> index 4471674..5428aff 100644
> --- a/drivers/infiniband/hw/ipath/ipath_init_chip.c
> +++ b/drivers/infiniband/hw/ipath/ipath_init_chip.c
> @@ -523,16 +523,16 @@ static void enable_chip(struct ipath_devdata *dd,
>  	 * initial values of the generation bit correct.
>  	 */
>  	for (i = 0; i < dd->ipath_pioavregs; i++) {
> -		__le64 val;
> +		__le64 pioavail;
>  
>  		/*
>  		 * Chip Errata bug 6641; even and odd qwords>3 are swapped.
>  		 */
>  		if (i > 3 && (dd->ipath_flags & IPATH_SWAP_PIOBUFS))
> -			val = dd->ipath_pioavailregs_dma[i ^ 1];
> +			pioavail = dd->ipath_pioavailregs_dma[i ^ 1];
>  		else
> -			val = dd->ipath_pioavailregs_dma[i];
> -		dd->ipath_pioavailshadow[i] = le64_to_cpu(val);
> +			pioavail = dd->ipath_pioavailregs_dma[i];
> +		dd->ipath_pioavailshadow[i] = le64_to_cpu(pioavail);
>  	}
>  	/* can get counters, stats, etc. */
>  	dd->ipath_flags |= IPATH_PRESENT;
> -- 
> 1.5.4.2
>