drm/hisilicon: Use pcim_enable_device()

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>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/1608511522-3100-1-git-send-email-tiantao6@hisilicon.com

diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
index 02f3bd158c86372503ff584adda1e32c42580cb4..7159018b7287cfdde699ad4d1aaa531b5ba82733 100644 (file)
--- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
+++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
@@ -329,7 +329,7 @@ static int hibmc_pci_probe(struct pci_dev *pdev,
        dev->pdev = pdev;
        pci_set_drvdata(pdev, dev);
 
-       ret = pci_enable_device(pdev);
+       ret = pcim_enable_device(pdev);
        if (ret) {
                drm_err(dev, "failed to enable pci device: %d\n", ret);
                goto err_free;
@@ -338,7 +338,7 @@ static int hibmc_pci_probe(struct pci_dev *pdev,
        ret = hibmc_load(dev);
        if (ret) {
                drm_err(dev, "failed to load hibmc: %d\n", ret);
-               goto err_disable;
+               goto err_free;
        }
 
        ret = drm_dev_register(dev, 0);
@@ -354,8 +354,6 @@ static int hibmc_pci_probe(struct pci_dev *pdev,
 
 err_unload:
        hibmc_unload(dev);
-err_disable:
-       pci_disable_device(pdev);
 err_free:
        drm_dev_put(dev);