UPSTREAM: drm/i915/intel_i2c: cleanup error messages and comments

Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
(cherry picked from commit 874e3cc90ba2fe1420945c1ac93781aa8dd33b53)

Change-Id: Iceb3aa56f3264a7ed0e100cfa689e7f82d74a4fb
Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>

diff --git a/drivers/gpu/drm/i915/intel_i2c.c b/drivers/gpu/drm/i915/intel_i2c.c
index 30675ce..e6c090b 100644 (file)
--- a/drivers/gpu/drm/i915/intel_i2c.c
+++ b/drivers/gpu/drm/i915/intel_i2c.c
@@ -333,17 +333,20 @@ done:
         * till then let it sleep.
         */
        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);
        ret = i;
        goto out;
 
 timeout:
-       DRM_INFO("GMBUS timed out, falling back to bit banging on pin %d [%s]\n",
-                bus->reg0 & 0xff, bus->adapter.name);
+       DRM_INFO("GMBUS [%s] timed out, falling back to bit banging on pin %d\n",
+                bus->adapter.name, bus->reg0 & 0xff);
        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) {
                ret = -EIO;
        } else {