lkml.org 
[lkml]   [2012]   [Mar]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 01/10 v2] drm/i915/intel_i2c: cleanup
    Date
    80 col, spaces around operators and other basic cleanup.

    Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
    ---
    drivers/gpu/drm/i915/intel_i2c.c | 19 +++++++++++++------
    1 files changed, 13 insertions(+), 6 deletions(-)

    diff --git a/drivers/gpu/drm/i915/intel_i2c.c b/drivers/gpu/drm/i915/intel_i2c.c
    index d30cccc..5e413c4 100644
    --- a/drivers/gpu/drm/i915/intel_i2c.c
    +++ b/drivers/gpu/drm/i915/intel_i2c.c
    @@ -253,11 +253,13 @@ gmbus_xfer(struct i2c_adapter *adapter,
    (len << GMBUS_BYTE_COUNT_SHIFT) |
    (msgs[i].addr << GMBUS_SLAVE_ADDR_SHIFT) |
    GMBUS_SLAVE_READ | GMBUS_SW_RDY);
    - POSTING_READ(GMBUS2+reg_offset);
    + POSTING_READ(GMBUS2 + reg_offset);
    do {
    u32 val, loop = 0;

    - if (wait_for(I915_READ(GMBUS2 + reg_offset) & (GMBUS_SATOER | GMBUS_HW_RDY), 50))
    + if (wait_for(I915_READ(GMBUS2 + reg_offset) &
    + (GMBUS_SATOER | GMBUS_HW_RDY),
    + 50))
    goto timeout;
    if (I915_READ(GMBUS2 + reg_offset) & GMBUS_SATOER)
    goto clear_err;
    @@ -282,10 +284,12 @@ gmbus_xfer(struct i2c_adapter *adapter,
    (msgs[i].len << GMBUS_BYTE_COUNT_SHIFT) |
    (msgs[i].addr << GMBUS_SLAVE_ADDR_SHIFT) |
    GMBUS_SLAVE_WRITE | GMBUS_SW_RDY);
    - POSTING_READ(GMBUS2+reg_offset);
    + POSTING_READ(GMBUS2 + reg_offset);

    while (len) {
    - if (wait_for(I915_READ(GMBUS2 + reg_offset) & (GMBUS_SATOER | GMBUS_HW_RDY), 50))
    + if (wait_for(I915_READ(GMBUS2 + reg_offset) &
    + (GMBUS_SATOER | GMBUS_HW_RDY),
    + 50))
    goto timeout;
    if (I915_READ(GMBUS2 + reg_offset) & GMBUS_SATOER)
    goto clear_err;
    @@ -296,11 +300,14 @@ gmbus_xfer(struct i2c_adapter *adapter,
    } while (--len && ++loop < 4);

    I915_WRITE(GMBUS3 + reg_offset, val);
    - POSTING_READ(GMBUS2+reg_offset);
    + POSTING_READ(GMBUS2 + reg_offset);
    }
    }

    - if (i + 1 < num && wait_for(I915_READ(GMBUS2 + reg_offset) & (GMBUS_SATOER | GMBUS_HW_WAIT_PHASE), 50))
    + if (i + 1 < num &&
    + wait_for(I915_READ(GMBUS2 + reg_offset) &
    + (GMBUS_SATOER | GMBUS_HW_WAIT_PHASE),
    + 50))
    goto timeout;
    if (I915_READ(GMBUS2 + reg_offset) & GMBUS_SATOER)
    goto clear_err;
    --
    1.7.7.3


    \
     
     \ /
      Last update: 2012-03-09 19:59    [W:0.030 / U:29.640 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site