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:34 +0100
committerDave Airlie <airlied@redhat.com>2013-12-18 02:18:12 +0100
commit8da79ccd1aaa2efe482b2c555c4684c7b503864a (patch)
tree916684aed64742851149eae1e963887e8b998544 /drivers/gpu/drm/drm_stub.c
parentdrm: kill DRIVER_REQUIRE_AGP (diff)
downloadlinux-8da79ccd1aaa2efe482b2c555c4684c7b503864a.tar.xz
linux-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_stub.c')
-rw-r--r--drivers/gpu/drm/drm_stub.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
index 9de0d3d91cc6..82141e6e8ac8 100644
--- a/drivers/gpu/drm/drm_stub.c
+++ b/drivers/gpu/drm/drm_stub.c
@@ -527,11 +527,8 @@ int drm_dev_register(struct drm_device *dev, unsigned long flags)
mutex_lock(&drm_global_mutex);
- if (dev->driver->bus->agp_init) {
- ret = dev->driver->bus->agp_init(dev);
- if (ret)
- goto out_unlock;
- }
+ if (dev->driver->bus->agp_init)
+ dev->driver->bus->agp_init(dev);
if (drm_core_check_feature(dev, DRIVER_MODESET)) {
ret = drm_get_minor(dev, &dev->control, DRM_MINOR_CONTROL);