diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2015-12-01 16:29:25 +0200 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2015-12-02 13:27:46 +0200 |
| commit | 0aeb904888f52f48ca0cc7dfec2c2f540d2a762a (patch) | |
| tree | 705079befdf76b1cb11a91f35a98e45b96f3ef29 /drivers/gpu/drm/i915/intel_i2c.c | |
| parent | 79bd23dadf613fb5ebc1d9aa178fd7129c3e059c (diff) | |
| download | op-kernel-dev-0aeb904888f52f48ca0cc7dfec2c2f540d2a762a.zip op-kernel-dev-0aeb904888f52f48ca0cc7dfec2c2f540d2a762a.tar.gz | |
drm/i915: simplify gmbus xfer error checks
Shorter, easier to follow code with no functional changes. In all cases,
the return value ultimately comes from gmbus_wait_hw_status() anyway.
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1448980166-23055-1-git-send-email-jani.nikula@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_i2c.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_i2c.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/gpu/drm/i915/intel_i2c.c b/drivers/gpu/drm/i915/intel_i2c.c index 1110c83..ccb522c 100644 --- a/drivers/gpu/drm/i915/intel_i2c.c +++ b/drivers/gpu/drm/i915/intel_i2c.c @@ -505,17 +505,13 @@ retry: ret = gmbus_xfer_write(dev_priv, &msgs[i]); } + if (!ret) + ret = gmbus_wait_hw_status(dev_priv, GMBUS_HW_WAIT_PHASE, + GMBUS_HW_WAIT_EN); if (ret == -ETIMEDOUT) goto timeout; - if (ret == -ENXIO) + else if (ret) goto clear_err; - - ret = gmbus_wait_hw_status(dev_priv, GMBUS_HW_WAIT_PHASE, - GMBUS_HW_WAIT_EN); - if (ret == -ENXIO) - goto clear_err; - if (ret) - goto timeout; } /* Generate a STOP condition on the bus. Note that gmbus can't generata |
