diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-12-11 11:34:34 +0100 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2013-12-18 11:18:12 +1000 |
commit | 8da79ccd1aaa2efe482b2c555c4684c7b503864a (patch) | |
tree | 916684aed64742851149eae1e963887e8b998544 /drivers/gpu/drm/drm_stub.c | |
parent | 24986ee06929a8de3a5b4722ccadf0b85c175264 (diff) | |
download | blackbird-op-linux-8da79ccd1aaa2efe482b2c555c4684c7b503864a.tar.gz blackbird-op-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.c | 7 |
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); |