i2c-rk30: remove idle wake lock
author黄涛 <huangtao@rock-chips.com>
Wed, 26 Sep 2012 06:38:18 +0000 (14:38 +0800)
committer黄涛 <huangtao@rock-chips.com>
Wed, 26 Sep 2012 06:38:18 +0000 (14:38 +0800)
drivers/i2c/busses/i2c-rk30-adapter.c
drivers/i2c/busses/i2c-rk30.c

index 7149d35ca44ae5ef3a4f71eae28d71ee5e17eddb..7a54559360f240f92e0912c249e7b1d3422601ed 100755 (executable)
@@ -566,7 +566,6 @@ static int rk30_i2c_xfer(struct i2c_adapter *adap,
        }
         if(i2c->is_div_from_arm[i2c->adap.nr]){
                 mutex_lock(&i2c->m_lock);
-               wake_lock(&i2c->idlelock[i2c->adap.nr]);
         }
 
        rk30_i2c_set_clk(i2c, scl_rate);
@@ -575,7 +574,6 @@ static int rk30_i2c_xfer(struct i2c_adapter *adap,
         i2c_dbg(i2c->dev, "i2c transfer stop: addr: 0x%x, state: %d, ret: %d\n", msgs[0].addr, ret, i2c->state);
 
         if(i2c->is_div_from_arm[i2c->adap.nr]){
-               wake_unlock(&i2c->idlelock[i2c->adap.nr]);
                 mutex_unlock(&i2c->m_lock);
         }
 
index fbdda127868552164d4d5240e804972c55e5362e..54a6d2b818ff6f95fcc4369a0d95d33ccd68be17 100755 (executable)
@@ -200,8 +200,6 @@ static int rk30_i2c_probe(struct platform_device *pdev)
        platform_set_drvdata(pdev, i2c);
 
         i2c->is_div_from_arm[i2c->adap.nr] = pdata->is_div_from_arm;
-        if(i2c->is_div_from_arm[i2c->adap.nr])
-                wake_lock_init(&i2c->idlelock[i2c->adap.nr], WAKE_LOCK_IDLE, dev_name(&pdev->dev));
 
         i2c->i2c_init_hw(i2c, 100 * 1000);
        dev_info(&pdev->dev, "%s: RK30 I2C adapter\n", dev_name(&i2c->adap.dev));