Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 874e3cc9 authored by Daniel Kurtz's avatar Daniel Kurtz Committed by Daniel Vetter
Browse files

drm/i915/intel_i2c: cleanup error messages and comments 



Signed-off-by: default avatarDaniel Kurtz <djkurtz@chromium.org>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 924a93ed

drivers/gpu/drm/i915/intel_i2c.c

+7 −4
Original line number Original line Diff line number Diff line
@@ -333,17 +333,20 @@ done: 
	 * till then let it sleep.

	 * till then let it sleep.

	 */

	 */

	if (wait_for((I915_READ(GMBUS2 + reg_offset) & GMBUS_ACTIVE) == 0, 10))

	if (wait_for((I915_READ(GMBUS2 + reg_offset) & GMBUS_ACTIVE) == 0, 10))

		DRM_INFO("GMBUS timed out waiting for idle\n");

		DRM_INFO("GMBUS [%s] timed out waiting for idle\n",

			 bus->adapter.name);

	I915_WRITE(GMBUS0 + reg_offset, 0);

	I915_WRITE(GMBUS0 + reg_offset, 0);

	ret = i;

	ret = i;

	goto out;

	goto out;





timeout:

timeout:

	DRM_INFO("GMBUS timed out, falling back to bit banging on pin %d [%s]\n",

	DRM_INFO("GMBUS [%s] timed out, falling back to bit banging on pin %d\n",

		 bus->reg0 & 0xff, bus->adapter.name);

		 bus->adapter.name, bus->reg0 & 0xff);

	I915_WRITE(GMBUS0 + reg_offset, 0);

	I915_WRITE(GMBUS0 + reg_offset, 0);





	/* Hardware may not support GMBUS over these pins? Try GPIO bitbanging instead. */

	/* Hardware may not support GMBUS over these pins?

	 * Try GPIO bitbanging instead.

	 */

	if (!bus->has_gpio) {

	if (!bus->has_gpio) {

		ret = -EIO;

		ret = -EIO;

	} else {

	} else {