Commit 4c5d02d9 authored by Tian Tao's avatar Tian Tao

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: default avatarTian Tao <tiantao6@hisilicon.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/1608511522-3100-1-git-send-email-tiantao6@hisilicon.com
parent b39100a5
...@@ -329,7 +329,7 @@ static int hibmc_pci_probe(struct pci_dev *pdev, ...@@ -329,7 +329,7 @@ static int hibmc_pci_probe(struct pci_dev *pdev,
dev->pdev = pdev; dev->pdev = pdev;
pci_set_drvdata(pdev, dev); pci_set_drvdata(pdev, dev);
ret = pci_enable_device(pdev); ret = pcim_enable_device(pdev);
if (ret) { if (ret) {
drm_err(dev, "failed to enable pci device: %d\n", ret); drm_err(dev, "failed to enable pci device: %d\n", ret);
goto err_free; goto err_free;
...@@ -338,7 +338,7 @@ static int hibmc_pci_probe(struct pci_dev *pdev, ...@@ -338,7 +338,7 @@ static int hibmc_pci_probe(struct pci_dev *pdev,
ret = hibmc_load(dev); ret = hibmc_load(dev);
if (ret) { if (ret) {
drm_err(dev, "failed to load hibmc: %d\n", ret); drm_err(dev, "failed to load hibmc: %d\n", ret);
goto err_disable; goto err_free;
} }
ret = drm_dev_register(dev, 0); ret = drm_dev_register(dev, 0);
...@@ -354,8 +354,6 @@ static int hibmc_pci_probe(struct pci_dev *pdev, ...@@ -354,8 +354,6 @@ static int hibmc_pci_probe(struct pci_dev *pdev,
err_unload: err_unload:
hibmc_unload(dev); hibmc_unload(dev);
err_disable:
pci_disable_device(pdev);
err_free: err_free:
drm_dev_put(dev); drm_dev_put(dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment