diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-12-11 05:34:34 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2013-12-17 20:18:12 -0500 |
commit | 8da79ccd1aaa2efe482b2c555c4684c7b503864a (patch) | |
tree | 916684aed64742851149eae1e963887e8b998544 /drivers/gpu/drm/drm_pci.c | |
parent | 24986ee06929a8de3a5b4722ccadf0b85c175264 (diff) |
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_pci.c')
-rw-r--r-- | drivers/gpu/drm/drm_pci.c | 3 |
1 files changed, 1 insertions, 2 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) | |||
262 | return 0; | 262 | return 0; |
263 | } | 263 | } |
264 | 264 | ||
265 | static int drm_pci_agp_init(struct drm_device *dev) | 265 | static void drm_pci_agp_init(struct drm_device *dev) |
266 | { | 266 | { |
267 | if (drm_core_has_AGP(dev)) { | 267 | if (drm_core_has_AGP(dev)) { |
268 | if (drm_pci_device_is_agp(dev)) | 268 | if (drm_pci_device_is_agp(dev)) |
@@ -274,7 +274,6 @@ static int drm_pci_agp_init(struct drm_device *dev) | |||
274 | 1024 * 1024); | 274 | 1024 * 1024); |
275 | } | 275 | } |
276 | } | 276 | } |
277 | return 0; | ||
278 | } | 277 | } |
279 | 278 | ||
280 | static void drm_pci_agp_destroy(struct drm_device *dev) | 279 | static void drm_pci_agp_destroy(struct drm_device *dev) |