summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/drm_stub.c
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2013-12-11 11:34:38 +0100
committerDave Airlie <airlied@redhat.com>2013-12-18 11:24:39 +1000
commit4efafebe709b8daa90b2f34a6e242eec7df98f25 (patch)
treed887c5e4d4693527c88eb9d6fee89c5091094ac0 /drivers/gpu/drm/drm_stub.c
parentd6e4b28b60c5dae660aebe5cd731b21d02ca285e (diff)
downloadlinux-stable-4efafebe709b8daa90b2f34a6e242eec7df98f25.tar.gz
linux-stable-4efafebe709b8daa90b2f34a6e242eec7df98f25.tar.bz2
linux-stable-4efafebe709b8daa90b2f34a6e242eec7df98f25.zip
drm: kill the ->agp_destroy callback
Call drm_pci_agp_destroy directly, there's no point in the indirection. Long term we want to shuffle this into each driver's unload logic, but that needs cleared-up drm lifetime rules first. v2: Add a dummy function for !CONFIG_PCI, spotted my David Herrmann. v3: Fixup for the coding style police. Reviewed-by: David Herrmann <dh.herrmann@gmail.com> Cc: David Herrmann <dh.herrmann@gmail.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/drm_stub.c')
-rw-r--r--drivers/gpu/drm/drm_stub.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
index 128a2b7a1f66..a4a5c6ac110a 100644
--- a/drivers/gpu/drm/drm_stub.c
+++ b/drivers/gpu/drm/drm_stub.c
@@ -592,8 +592,8 @@ void drm_dev_unregister(struct drm_device *dev)
if (dev->driver->unload)
dev->driver->unload(dev);
- if (dev->driver->bus->agp_destroy)
- dev->driver->bus->agp_destroy(dev);
+ if (dev->agp)
+ drm_pci_agp_destroy(dev);
drm_vblank_cleanup(dev);