aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_i2c.c
diff options
context:
space:
mode:
authorDaniel Kurtz <djkurtz@chromium.org>2012-03-27 14:36:11 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-03-28 03:44:44 -0400
commit874e3cc90ba2fe1420945c1ac93781aa8dd33b53 (patch)
tree4ec5ce1e225c4fd9a93dad69383e61332585e10d /drivers/gpu/drm/i915/intel_i2c.c
parent924a93edc96b7f7e08a0af7a2f9afe4827bab103 (diff)
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>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_i2c.c')
-rw-r--r--drivers/gpu/drm/i915/intel_i2c.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/intel_i2c.c b/drivers/gpu/drm/i915/intel_i2c.c
index 30675ce18056..e6c090bff9f2 100644
--- a/drivers/gpu/drm/i915/intel_i2c.c
+++ b/drivers/gpu/drm/i915/intel_i2c.c
@@ -333,17 +333,20 @@ done:
333 * till then let it sleep. 333 * till then let it sleep.
334 */ 334 */
335 if (wait_for((I915_READ(GMBUS2 + reg_offset) & GMBUS_ACTIVE) == 0, 10)) 335 if (wait_for((I915_READ(GMBUS2 + reg_offset) & GMBUS_ACTIVE) == 0, 10))
336 DRM_INFO("GMBUS timed out waiting for idle\n"); 336 DRM_INFO("GMBUS [%s] timed out waiting for idle\n",
337 bus->adapter.name);
337 I915_WRITE(GMBUS0 + reg_offset, 0); 338 I915_WRITE(GMBUS0 + reg_offset, 0);
338 ret = i; 339 ret = i;
339 goto out; 340 goto out;
340 341
341timeout: 342timeout:
342 DRM_INFO("GMBUS timed out, falling back to bit banging on pin %d [%s]\n", 343 DRM_INFO("GMBUS [%s] timed out, falling back to bit banging on pin %d\n",
343 bus->reg0 & 0xff, bus->adapter.name); 344 bus->adapter.name, bus->reg0 & 0xff);
344 I915_WRITE(GMBUS0 + reg_offset, 0); 345 I915_WRITE(GMBUS0 + reg_offset, 0);
345 346
346 /* Hardware may not support GMBUS over these pins? Try GPIO bitbanging instead. */ 347 /* Hardware may not support GMBUS over these pins?
348 * Try GPIO bitbanging instead.
349 */
347 if (!bus->has_gpio) { 350 if (!bus->has_gpio) {
348 ret = -EIO; 351 ret = -EIO;
349 } else { 352 } else {