diff mbox series

[next] dmaengine: dw-axi-dmac: remove redundant null check on desc

Message ID 20210203134652.22618-1-colin.king@canonical.com (mailing list archive)
State Accepted
Headers show
Series [next] dmaengine: dw-axi-dmac: remove redundant null check on desc | expand

Commit Message

Colin King Feb. 3, 2021, 1:46 p.m. UTC 
From: Colin Ian King <colin.king@canonical.com>

The pointer desc is being null checked twice, the second null check
is redundant because desc has not been re-assigned between the
checks. Remove the redundant second null check on desc.

Addresses-Coverity: ("Logically dead code")
Fixes: ef6fb2d6f1ab ("dmaengine: dw-axi-dmac: simplify descriptor management")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 4 ----
 1 file changed, 4 deletions(-)

Comments

Sia Jee Heng Feb. 4, 2021, 12:18 a.m. UTC | #1 
The code looks good to me. I have also verified it on Intel KeemBay platform.

Reviewed-by: Sia Jee Heng <jee.heng.sia@intel.com>
Tested-by: Sia Jee Heng <jee.heng.sia@intel.com>

Thanks
Regards
Jee Heng
> -----Original Message-----
> From: Colin King <colin.king@canonical.com>
> Sent: 03 February 2021 9:47 PM
> To: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>; Vinod Koul
> <vkoul@kernel.org>; Sia, Jee Heng <jee.heng.sia@intel.com>; Andy
> Shevchenko <andriy.shevchenko@linux.intel.com>;
> dmaengine@vger.kernel.org
> Cc: kernel-janitors@vger.kernel.org; linux-kernel@vger.kernel.org
> Subject: [PATCH][next] dmaengine: dw-axi-dmac: remove redundant
> null check on desc
> 
> From: Colin Ian King <colin.king@canonical.com>
> 
> The pointer desc is being null checked twice, the second null check is
> redundant because desc has not been re-assigned between the checks.
> Remove the redundant second null check on desc.
> 
> Addresses-Coverity: ("Logically dead code")
> Fixes: ef6fb2d6f1ab ("dmaengine: dw-axi-dmac: simplify descriptor
> management")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>  drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 4 ----
>  1 file changed, 4 deletions(-)
> 
> diff --git a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
> b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
> index ac3d81b72a15..d9e4ac3edb4e 100644
> --- a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
> +++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
> @@ -919,10 +919,6 @@ dma_chan_prep_dma_memcpy(struct
> dma_chan *dchan, dma_addr_t dst_adr,
>  		num++;
>  	}
> 
> -	/* Total len of src/dest sg == 0, so no descriptor were
> allocated */
> -	if (unlikely(!desc))
> -		return NULL;
> -
>  	/* Set end-of-link to the last link descriptor of list */
>  	set_desc_last(&desc->hw_desc[num - 1]);
>  	/* Managed transfer list */
> --
> 2.29.2
Vinod Koul Feb. 8, 2021, 12:09 p.m. UTC | #2 
On 04-02-21, 00:18, Sia, Jee Heng wrote:
> The code looks good to me. I have also verified it on Intel KeemBay platform.
> 
> Reviewed-by: Sia Jee Heng <jee.heng.sia@intel.com>
> Tested-by: Sia Jee Heng <jee.heng.sia@intel.com>

Please *do not* top post!

> 
> Thanks
> Regards
> Jee Heng
> > -----Original Message-----
> > From: Colin King <colin.king@canonical.com>
> > Sent: 03 February 2021 9:47 PM
> > To: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>; Vinod Koul
> > <vkoul@kernel.org>; Sia, Jee Heng <jee.heng.sia@intel.com>; Andy
> > Shevchenko <andriy.shevchenko@linux.intel.com>;
> > dmaengine@vger.kernel.org
> > Cc: kernel-janitors@vger.kernel.org; linux-kernel@vger.kernel.org
> > Subject: [PATCH][next] dmaengine: dw-axi-dmac: remove redundant
> > null check on desc
> > 
> > From: Colin Ian King <colin.king@canonical.com>
> > 
> > The pointer desc is being null checked twice, the second null check is
> > redundant because desc has not been re-assigned between the checks.
> > Remove the redundant second null check on desc.
> > 
> > Addresses-Coverity: ("Logically dead code")
> > Fixes: ef6fb2d6f1ab ("dmaengine: dw-axi-dmac: simplify descriptor
> > management")
> > Signed-off-by: Colin Ian King <colin.king@canonical.com>
> > ---
> >  drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 4 ----
> >  1 file changed, 4 deletions(-)
> > 
> > diff --git a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
> > b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
> > index ac3d81b72a15..d9e4ac3edb4e 100644
> > --- a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
> > +++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
> > @@ -919,10 +919,6 @@ dma_chan_prep_dma_memcpy(struct
> > dma_chan *dchan, dma_addr_t dst_adr,
> >  		num++;
> >  	}
> > 
> > -	/* Total len of src/dest sg == 0, so no descriptor were
> > allocated */
> > -	if (unlikely(!desc))
> > -		return NULL;
> > -
> >  	/* Set end-of-link to the last link descriptor of list */
> >  	set_desc_last(&desc->hw_desc[num - 1]);
> >  	/* Managed transfer list */
> > --
> > 2.29.2
>
Vinod Koul Feb. 8, 2021, 12:10 p.m. UTC | #3 
On 03-02-21, 13:46, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
> 
> The pointer desc is being null checked twice, the second null check
> is redundant because desc has not been re-assigned between the
> checks. Remove the redundant second null check on desc.

Applied, thanks
diff mbox series

Patch

diff --git a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
index ac3d81b72a15..d9e4ac3edb4e 100644
--- a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
+++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
@@ -919,10 +919,6 @@  dma_chan_prep_dma_memcpy(struct dma_chan *dchan, dma_addr_t dst_adr,
 		num++;
 	}
 
-	/* Total len of src/dest sg == 0, so no descriptor were allocated */
-	if (unlikely(!desc))
-		return NULL;
-
 	/* Set end-of-link to the last link descriptor of list */
 	set_desc_last(&desc->hw_desc[num - 1]);
 	/* Managed transfer list */