[4/9,media] pci: mantis: Remove redundant pci_set_drvdata

Message ID 1379666181-19546-4-git-send-email-sachin.kamat@linaro.org (mailing list archive)
State Accepted, archived
Delegated to: Hans Verkuil
Headers

Commit Message

Sachin Kamat Sept. 20, 2013, 8:36 a.m. UTC
  Driver core sets driver data to NULL upon failure or remove.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Cc: Manu Abraham <abraham.manu@gmail.com>
---
 drivers/media/pci/mantis/mantis_pci.c |    2 --
 1 file changed, 2 deletions(-)
  

Comments

Manu Abraham Oct. 1, 2013, 5:37 a.m. UTC | #1
On Fri, Sep 20, 2013 at 2:06 PM, Sachin Kamat <sachin.kamat@linaro.org> wrote:
> Driver core sets driver data to NULL upon failure or remove.
>
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> Cc: Manu Abraham <abraham.manu@gmail.com>
Acked-by: Manu Abraham <manu@linuxtv.org>
> ---
>  drivers/media/pci/mantis/mantis_pci.c |    2 --
>  1 file changed, 2 deletions(-)
>
> diff --git a/drivers/media/pci/mantis/mantis_pci.c b/drivers/media/pci/mantis/mantis_pci.c
> index a846036..9e89e04 100644
> --- a/drivers/media/pci/mantis/mantis_pci.c
> +++ b/drivers/media/pci/mantis/mantis_pci.c
> @@ -143,7 +143,6 @@ fail1:
>
>  fail0:
>         dprintk(MANTIS_ERROR, 1, "ERROR: <%d> exiting", ret);
> -       pci_set_drvdata(pdev, NULL);
>         return ret;
>  }
>  EXPORT_SYMBOL_GPL(mantis_pci_init);
> @@ -161,7 +160,6 @@ void mantis_pci_exit(struct mantis_pci *mantis)
>         }
>
>         pci_disable_device(pdev);
> -       pci_set_drvdata(pdev, NULL);
>  }
>  EXPORT_SYMBOL_GPL(mantis_pci_exit);
>
> --
> 1.7.9.5
>
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
  

Patch

diff --git a/drivers/media/pci/mantis/mantis_pci.c b/drivers/media/pci/mantis/mantis_pci.c
index a846036..9e89e04 100644
--- a/drivers/media/pci/mantis/mantis_pci.c
+++ b/drivers/media/pci/mantis/mantis_pci.c
@@ -143,7 +143,6 @@  fail1:
 
 fail0:
 	dprintk(MANTIS_ERROR, 1, "ERROR: <%d> exiting", ret);
-	pci_set_drvdata(pdev, NULL);
 	return ret;
 }
 EXPORT_SYMBOL_GPL(mantis_pci_init);
@@ -161,7 +160,6 @@  void mantis_pci_exit(struct mantis_pci *mantis)
 	}
 
 	pci_disable_device(pdev);
-	pci_set_drvdata(pdev, NULL);
 }
 EXPORT_SYMBOL_GPL(mantis_pci_exit);