From: 黄涛 Date: Wed, 26 Sep 2012 06:38:18 +0000 (+0800) Subject: i2c-rk30: remove idle wake lock X-Git-Tag: firefly_0821_release~8569 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=45dd8ad03dfec8db4b16220e24d08d04cf8f0ae8;p=firefly-linux-kernel-4.4.55.git i2c-rk30: remove idle wake lock --- diff --git a/drivers/i2c/busses/i2c-rk30-adapter.c b/drivers/i2c/busses/i2c-rk30-adapter.c index 7149d35ca44a..7a54559360f2 100755 --- a/drivers/i2c/busses/i2c-rk30-adapter.c +++ b/drivers/i2c/busses/i2c-rk30-adapter.c @@ -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); } diff --git a/drivers/i2c/busses/i2c-rk30.c b/drivers/i2c/busses/i2c-rk30.c index fbdda1278685..54a6d2b818ff 100755 --- a/drivers/i2c/busses/i2c-rk30.c +++ b/drivers/i2c/busses/i2c-rk30.c @@ -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));