[PATCH] drm/pci: Use pcim_enable_device()

[PATCH] drm/pci: Use pcim_enable_device()

[Tian Tao]

Using the managed function simplifies the error handling. After
unloading the driver, the PCI device should now get disabled as
well.

Signed-off-by: Tian Tao <tiantao6@hisilicon.com>
---
 drivers/gpu/drm/drm_pci.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c
index 6dba4b8..0616172 100644
--- a/drivers/gpu/drm/drm_pci.c
+++ b/drivers/gpu/drm/drm_pci.c
@@ -207,7 +207,7 @@ static int drm_get_pci_dev(struct pci_dev *pdev,
 	if (IS_ERR(dev))
 		return PTR_ERR(dev);
 
-	ret = pci_enable_device(pdev);
+	ret = pcim_enable_device(pdev);
 	if (ret)
 		goto err_free;
 
@@ -234,7 +234,6 @@ static int drm_get_pci_dev(struct pci_dev *pdev,
 
 err_agp:
 	drm_pci_agp_destroy(dev);
-	pci_disable_device(pdev);
 err_free:
 	drm_dev_put(dev);
 	return ret;
-- 
2.7.4

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH] drm/pci: Use pcim_enable_device()

[Daniel Vetter]

On Mon, Dec 28, 2020 at 06:39:56PM +0800, Tian Tao wrote:
> Using the managed function simplifies the error handling. After
> unloading the driver, the PCI device should now get disabled as
> well.
> 
> Signed-off-by: Tian Tao <tiantao6@hisilicon.com>

We cant do this in core code because it changes the order of how the
cleanup code is done. Also this is legacy code, pls don't touch that, not
worth the effort :-)
-Daniel

> ---
>  drivers/gpu/drm/drm_pci.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c
> index 6dba4b8..0616172 100644
> --- a/drivers/gpu/drm/drm_pci.c
> +++ b/drivers/gpu/drm/drm_pci.c
> @@ -207,7 +207,7 @@ static int drm_get_pci_dev(struct pci_dev *pdev,
>  	if (IS_ERR(dev))
>  		return PTR_ERR(dev);
>  
> -	ret = pci_enable_device(pdev);
> +	ret = pcim_enable_device(pdev);
>  	if (ret)
>  		goto err_free;
>  
> @@ -234,7 +234,6 @@ static int drm_get_pci_dev(struct pci_dev *pdev,
>  
>  err_agp:
>  	drm_pci_agp_destroy(dev);
> -	pci_disable_device(pdev);
>  err_free:
>  	drm_dev_put(dev);
>  	return ret;
> -- 
> 2.7.4
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel