[dpdk-stable] [PATCH] raw/ifpga: fix logically dead code

[dpdk-stable] [PATCH] raw/ifpga: fix logically dead code

[Zhang, Tianfei]

add temporary variable in max10_reg_write().

Coverity issue: 337927
Cc: stable@dpdk.org

Signed-off-by: Zhang, Tianfei <tianfei.zhang@intel.com>
---
 drivers/raw/ifpga_rawdev/base/opae_intel_max10.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/raw/ifpga_rawdev/base/opae_intel_max10.c b/drivers/raw/ifpga_rawdev/base/opae_intel_max10.c
index f354ee4b6..3ff6575d7 100644
--- a/drivers/raw/ifpga_rawdev/base/opae_intel_max10.c
+++ b/drivers/raw/ifpga_rawdev/base/opae_intel_max10.c
@@ -17,11 +17,13 @@ int max10_reg_read(unsigned int reg, unsigned int *val)
 
 int max10_reg_write(unsigned int reg, unsigned int val)
 {
+	unsigned int tmp = val;
+
 	if (!g_max10)
 		return -ENODEV;
 
 	return spi_transaction_write(g_max10->spi_tran_dev,
-			reg, 4, (unsigned char *)&val);
+			reg, 4, (unsigned char *)&tmp);
 }
 
 struct intel_max10_device *
@@ -57,7 +59,7 @@ intel_max10_device_probe(struct altera_spi_device *spi,
 
 	/* set PKVL Polling manually in BBS */
 	ret = max10_reg_write(PKVL_POLLING_CTRL, 0x3);
-	if (ret) {
+	if (ret != 0) {
 		dev_err(dev, "%s set PKVL polling fail\n", __func__);
 		goto spi_tran_fail;
 	}
-- 
2.17.1

Re: [dpdk-stable] [PATCH] raw/ifpga: fix logically dead code

[Xu, Rosen]

Hi Tianfei,

> -----Original Message-----
> From: Zhang, Tianfei
> Sent: Friday, May 17, 2019 19:25
> To: Xu, Rosen <rosen.xu@intel.com>
> Cc: Pei, Andy <andy.pei@intel.com>; Zhang, Tianfei
> <tianfei.zhang@intel.com>; stable@dpdk.org; Zhang
> Subject: [PATCH] raw/ifpga: fix logically dead code
> 
> add temporary variable in max10_reg_write().
> 
> Coverity issue: 337927
> Cc: stable@dpdk.org
> 
> Signed-off-by: Zhang, Tianfei <tianfei.zhang@intel.com>
> ---
>  drivers/raw/ifpga_rawdev/base/opae_intel_max10.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/raw/ifpga_rawdev/base/opae_intel_max10.c
> b/drivers/raw/ifpga_rawdev/base/opae_intel_max10.c
> index f354ee4b6..3ff6575d7 100644
> --- a/drivers/raw/ifpga_rawdev/base/opae_intel_max10.c
> +++ b/drivers/raw/ifpga_rawdev/base/opae_intel_max10.c
> @@ -17,11 +17,13 @@ int max10_reg_read(unsigned int reg, unsigned int
> *val)
> 
>  int max10_reg_write(unsigned int reg, unsigned int val)  {

If you don't need to modify val, why use const?

> +	unsigned int tmp = val;
> +
>  	if (!g_max10)
>  		return -ENODEV;
> 
>  	return spi_transaction_write(g_max10->spi_tran_dev,
> -			reg, 4, (unsigned char *)&val);
> +			reg, 4, (unsigned char *)&tmp);
>  }
> 
>  struct intel_max10_device *
> @@ -57,7 +59,7 @@ intel_max10_device_probe(struct altera_spi_device
> *spi,
> 
>  	/* set PKVL Polling manually in BBS */
>  	ret = max10_reg_write(PKVL_POLLING_CTRL, 0x3);
> -	if (ret) {
> +	if (ret != 0) {
>  		dev_err(dev, "%s set PKVL polling fail\n", __func__);
>  		goto spi_tran_fail;
>  	}
> --
> 2.17.1

Re: [dpdk-stable] [PATCH] raw/ifpga: fix logically dead code

[Zhang, Tianfei]

> -----Original Message-----
> From: Xu, Rosen
> Sent: Friday, May 17, 2019 12:43 PM
> To: Zhang, Tianfei <tianfei.zhang@intel.com>
> Cc: Pei, Andy <andy.pei@intel.com>; stable@dpdk.org
> Subject: RE: [PATCH] raw/ifpga: fix logically dead code
> 
> Hi Tianfei,
> 
> > -----Original Message-----
> > From: Zhang, Tianfei
> > Sent: Friday, May 17, 2019 19:25
> > To: Xu, Rosen <rosen.xu@intel.com>
> > Cc: Pei, Andy <andy.pei@intel.com>; Zhang, Tianfei
> > <tianfei.zhang@intel.com>; stable@dpdk.org; Zhang
> > Subject: [PATCH] raw/ifpga: fix logically dead code
> >
> > add temporary variable in max10_reg_write().
> >
> > Coverity issue: 337927
> > Cc: stable@dpdk.org
> >
> > Signed-off-by: Zhang, Tianfei <tianfei.zhang@intel.com>
> > ---
> >  drivers/raw/ifpga_rawdev/base/opae_intel_max10.c | 6 ++++--
> >  1 file changed, 4 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/raw/ifpga_rawdev/base/opae_intel_max10.c
> > b/drivers/raw/ifpga_rawdev/base/opae_intel_max10.c
> > index f354ee4b6..3ff6575d7 100644
> > --- a/drivers/raw/ifpga_rawdev/base/opae_intel_max10.c
> > +++ b/drivers/raw/ifpga_rawdev/base/opae_intel_max10.c
> > @@ -17,11 +17,13 @@ int max10_reg_read(unsigned int reg, unsigned int
> > *val)
> >
> >  int max10_reg_write(unsigned int reg, unsigned int val)  {
> 
> If you don't need to modify val, why use const?

I don't think it is necessary to use const for val, val is quiet simple and no one will modify it.
> 
> > +	unsigned int tmp = val;
> > +
> >  	if (!g_max10)
> >  		return -ENODEV;
> >
> >  	return spi_transaction_write(g_max10->spi_tran_dev,
> > -			reg, 4, (unsigned char *)&val);
> > +			reg, 4, (unsigned char *)&tmp);
> >  }
> >
> >  struct intel_max10_device *
> > @@ -57,7 +59,7 @@ intel_max10_device_probe(struct altera_spi_device
> > *spi,
> >
> >  	/* set PKVL Polling manually in BBS */
> >  	ret = max10_reg_write(PKVL_POLLING_CTRL, 0x3);
> > -	if (ret) {
> > +	if (ret != 0) {
> >  		dev_err(dev, "%s set PKVL polling fail\n", __func__);
> >  		goto spi_tran_fail;
> >  	}
> > --
> > 2.17.1