lkml.org 
[lkml]   [2012]   [Mar]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 02/13 v4] drm/i915/intel_i2c: cleanup error messages and comments
    Date
    Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
    ---
    drivers/gpu/drm/i915/intel_i2c.c | 11 +++++++----
    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 30675ce..e6c090b 100644
    --- 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 {
    --
    1.7.7.3


    \
     
     \ /
      Last update: 2012-03-27 20:39    [W:0.033 / U:89.388 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site