Skip to content

Commit 7cbb93d

Browse files
committed
drm/ast: Use managed pci functions
Allows us to remove a bit of cleanup code. Reviewed-by: Thomas Zimmermann <[email protected]> Signed-off-by: Daniel Vetter <[email protected]> Cc: Dave Airlie <[email protected]> Cc: Thomas Zimmermann <[email protected]> Cc: Gerd Hoffmann <[email protected]> Cc: Daniel Vetter <[email protected]> Cc: Emil Velikov <[email protected]> Cc: "Noralf Trønnes" <[email protected]> Cc: Sam Ravnborg <[email protected]> Cc: "Christian König" <[email protected]> Cc: "Y.C. Chen" <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 21d456a commit 7cbb93d

File tree

2 files changed

+3
-10
lines changed

2 files changed

+3
-10
lines changed

drivers/gpu/drm/ast/ast_drv.c

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,13 @@ static int ast_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
9191

9292
ast_kick_out_firmware_fb(pdev);
9393

94-
ret = pci_enable_device(pdev);
94+
ret = pcim_enable_device(pdev);
9595
if (ret)
9696
return ret;
9797

9898
dev = drm_dev_alloc(&driver, &pdev->dev);
99-
if (IS_ERR(dev)) {
100-
ret = PTR_ERR(dev);
101-
goto err_pci_disable_device;
102-
}
99+
if (IS_ERR(dev))
100+
return PTR_ERR(dev);
103101

104102
dev->pdev = pdev;
105103
pci_set_drvdata(pdev, dev);
@@ -120,8 +118,6 @@ static int ast_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
120118
ast_driver_unload(dev);
121119
err_drm_dev_put:
122120
drm_dev_put(dev);
123-
err_pci_disable_device:
124-
pci_disable_device(pdev);
125121
return ret;
126122

127123
}

drivers/gpu/drm/ast/ast_main.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -531,8 +531,5 @@ void ast_driver_unload(struct drm_device *dev)
531531
drm_mode_config_cleanup(dev);
532532

533533
ast_mm_fini(ast);
534-
if (ast->ioregs != ast->regs + AST_IO_MM_OFFSET)
535-
pci_iounmap(dev->pdev, ast->ioregs);
536-
pci_iounmap(dev->pdev, ast->regs);
537534
kfree(ast);
538535
}

0 commit comments

Comments
 (0)