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>

3 files changed, 4 insertions, 8 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)
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);
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index eef421bb7b95..04909a80735d 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -767,7 +767,7 @@ struct drm_bus {
                           struct drm_unique *unique);
         int (*irq_by_busid)(struct drm_device *dev, struct drm_irq_busid *p);
         /* hooks that are for PCI */
-        int (*agp_init)(struct drm_device *dev);
+        void (*agp_init)(struct drm_device *dev);
         void (*agp_destroy)(struct drm_device *dev);
 
 };