Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8da79ccd authored by Daniel Vetter's avatar Daniel Vetter Committed by Dave Airlie
Browse files

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: default avatarDavid Herrmann <dh.herrmann@gmail.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 24986ee0

drivers/gpu/drm/drm_pci.c

+1 −2
Original line number Diff line number Diff line
@@ -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)

drivers/gpu/drm/drm_stub.c

+2 −5
Original line number Diff line number Diff line
@@ -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);

include/drm/drmP.h

+1 −1
Original line number Diff line number Diff line
@@ -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);



};