aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/drm_pci.c
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2013-12-11 11:34:34 +0100
committerDave Airlie <airlied@redhat.com>2013-12-18 11:18:12 +1000
commit8da79ccd1aaa2efe482b2c555c4684c7b503864a (patch)
tree916684aed64742851149eae1e963887e8b998544 /drivers/gpu/drm/drm_pci.c
parentdrm: kill DRIVER_REQUIRE_AGP (diff)
downloadlinux-dev-8da79ccd1aaa2efe482b2c555c4684c7b503864a.tar.xz
linux-dev-8da79ccd1aaa2efe482b2c555c4684c7b503864a.zip
drm: ->agp_init can't fail
Thanks to the removal of REQUIRE_AGP we can use a void return value and shed a bit of complexity. Reviewed-by: 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_pci.c')
-rw-r--r--drivers/gpu/drm/drm_pci.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c
index c99c71b3d220..d3875e3f9d9c 100644
--- a/drivers/gpu/drm/drm_pci.c
+++ b/drivers/gpu/drm/drm_pci.c
@@ -262,7 +262,7 @@ static int drm_pci_irq_by_busid(struct drm_device *dev, struct drm_irq_busid *p)
return 0;
}
-static int drm_pci_agp_init(struct drm_device *dev)
+static void drm_pci_agp_init(struct drm_device *dev)
{
if (drm_core_has_AGP(dev)) {
if (drm_pci_device_is_agp(dev))
@@ -274,7 +274,6 @@ static int drm_pci_agp_init(struct drm_device *dev)
1024 * 1024);
}
}
- return 0;
}
static void drm_pci_agp_destroy(struct drm_device *dev)