From: Robert Beckett Date: Tue, 3 Jun 2014 08:08:26 +0000 (+0200) Subject: drm/i915: Simplify intel_gpu_reset X-Git-Tag: v3.17-rc1~82^2~63^2~67 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=542c184f0ea08ee65794c1f0b044e1db4f8aab1b;p=karo-tx-linux.git drm/i915: Simplify intel_gpu_reset Replaced ever growing switch for gen version with chained conditionals. Futre gen's only need to add a new one if they require something different. Reviewed-by: Damien Lespiau Signed-off-by: Robert Beckett [danvet: Picked from internal tree and white-wash commit message.] Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c index 871c2841af04..c90222dfe5ec 100644 --- a/drivers/gpu/drm/i915/intel_uncore.c +++ b/drivers/gpu/drm/i915/intel_uncore.c @@ -1154,18 +1154,16 @@ static int gen6_do_reset(struct drm_device *dev) int intel_gpu_reset(struct drm_device *dev) { - switch (INTEL_INFO(dev)->gen) { - case 8: - case 7: - case 6: return gen6_do_reset(dev); - case 5: return ironlake_do_reset(dev); - case 4: - if (IS_G4X(dev)) - return g4x_do_reset(dev); - else - return i965_do_reset(dev); - default: return -ENODEV; - } + if (INTEL_INFO(dev)->gen >= 6) + return gen6_do_reset(dev); + else if (IS_GEN5(dev)) + return ironlake_do_reset(dev); + else if (IS_G4X(dev)) + return g4x_do_reset(dev); + else if (IS_GEN4(dev)) + return i965_do_reset(dev); + else + return -ENODEV; } void intel_uncore_check_errors(struct drm_device *dev)