leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm: ->agp_init can't fail

Browse Source 
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>
This commit is contained in:
Daniel Vetter 2013-12-11 11:34:34 +01:00 committed by Dave Airlie
parent 24986ee069
commit 8da79ccd1a
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/gpu/drm/drm_pci.c
View File

@ -262,7 +262,7 @@ static int drm_pci_irq_by_busid(struct drm_device *dev, struct drm_irq_busid *p)
return 0; 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_core_has_AGP(dev)) {
if (drm_pci_device_is_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); 1024 * 1024);
} }
} }
return 0;
} }
static void drm_pci_agp_destroy(struct drm_device *dev) static void drm_pci_agp_destroy(struct drm_device *dev)

7
drivers/gpu/drm/drm_stub.c
View File

@ -527,11 +527,8 @@ int drm_dev_register(struct drm_device *dev, unsigned long flags)
mutex_lock(&drm_global_mutex); mutex_lock(&drm_global_mutex);
if (dev->driver->bus->agp_init) { if (dev->driver->bus->agp_init)
ret = dev->driver->bus->agp_init(dev); dev->driver->bus->agp_init(dev);
if (ret)
goto out_unlock;
}
if (drm_core_check_feature(dev, DRIVER_MODESET)) { if (drm_core_check_feature(dev, DRIVER_MODESET)) {
ret = drm_get_minor(dev, &dev->control, DRM_MINOR_CONTROL); ret = drm_get_minor(dev, &dev->control, DRM_MINOR_CONTROL);

2
include/drm/drmP.h
View File

@ -767,7 +767,7 @@ struct drm_bus {
struct drm_unique *unique); struct drm_unique *unique);
int (*irq_by_busid)(struct drm_device *dev, struct drm_irq_busid *p); int (*irq_by_busid)(struct drm_device *dev, struct drm_irq_busid *p);
/* hooks that are for PCI */ /* 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); void (*agp_destroy)(struct drm_device *dev);
}; };