drm/i915: simplify gmbus xfer error checks (0aeb9048) · Commits · 戴 / test

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

drivers/gpu/drm/i915/intel_i2c.c

+4 −8

Original line number	Original line	Diff line number	Diff line
	@@ -505,17 +505,13 @@ retry:
	ret = gmbus_xfer_write(dev_priv, &msgs[i]);		ret = gmbus_xfer_write(dev_priv, &msgs[i]);
	}		}

	if (ret == -ETIMEDOUT)		if (!ret)
	goto timeout;
	if (ret == -ENXIO)
	goto clear_err;

	ret = gmbus_wait_hw_status(dev_priv, GMBUS_HW_WAIT_PHASE,		ret = gmbus_wait_hw_status(dev_priv, GMBUS_HW_WAIT_PHASE,
	GMBUS_HW_WAIT_EN);		GMBUS_HW_WAIT_EN);
	if (ret == -ENXIO)		if (ret == -ETIMEDOUT)
	goto clear_err;
	if (ret)
	goto timeout;		goto timeout;
			else if (ret)
			goto clear_err;
	}		}

	/* Generate a STOP condition on the bus. Note that gmbus can't generata		/* Generate a STOP condition on the bus. Note that gmbus can't generata

Admin message