2015-06-25 11:16:42

by Maninder Singh

Subject: [PATCH v2] staging/comedi: remove unnecessary check around pci_dev_put

pci_dev_put checks for NULL pointer itself,
reported by coccinelle

Signed-off-by: Maninder Singh <[email protected]>
Reviewed-by: Yogesh Gaur <[email protected]>
---
v2: changelog typo cehcks -> checks

drivers/staging/comedi/drivers/adl_pci9118.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/adl_pci9118.c b/drivers/staging/comedi/drivers/adl_pci9118.c
index fb3043d..19b5806 100644
--- a/drivers/staging/comedi/drivers/adl_pci9118.c
+++ b/drivers/staging/comedi/drivers/adl_pci9118.c
@@ -1717,8 +1717,7 @@ static void pci9118_detach(struct comedi_device *dev)
pci9118_reset(dev);
comedi_pci_detach(dev);
pci9118_free_dma(dev);
- if (pcidev)
- pci_dev_put(pcidev);
+ pci_dev_put(pcidev);
}

static struct comedi_driver adl_pci9118_driver = {
--
1.7.9.5

2015-06-25 14:39:32

by Ian Abbott

Subject: Re: [PATCH v2] staging/comedi: remove unnecessary check around pci_dev_put

On 25/06/15 12:14, Maninder Singh wrote:
> pci_dev_put checks for NULL pointer itself,
> reported by coccinelle
>
> Signed-off-by: Maninder Singh <[email protected]>
> Reviewed-by: Yogesh Gaur <[email protected]>
> ---
> v2: changelog typo cehcks -> checks
>
> drivers/staging/comedi/drivers/adl_pci9118.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/staging/comedi/drivers/adl_pci9118.c b/drivers/staging/comedi/drivers/adl_pci9118.c
> index fb3043d..19b5806 100644
> --- a/drivers/staging/comedi/drivers/adl_pci9118.c
> +++ b/drivers/staging/comedi/drivers/adl_pci9118.c
> @@ -1717,8 +1717,7 @@ static void pci9118_detach(struct comedi_device *dev)
> pci9118_reset(dev);
> comedi_pci_detach(dev);
> pci9118_free_dma(dev);
> - if (pcidev)
> - pci_dev_put(pcidev);
> + pci_dev_put(pcidev);
> }
>
> static struct comedi_driver adl_pci9118_driver = {
>

The patch does no harm, but as mentioned by Dan Carpenter, if pcidev
could be NULL (which it could be), we should keep the test for readability.

--
-=( Ian Abbott @ MEV Ltd. E-mail: <[email protected]> )=-
-=( Web: http://www.mev.co.uk/ )=-