diff options
author | Wolfram Sang <wsa+renesas@sang-engineering.com> | 2015-12-23 12:19:29 -0500 |
---|---|---|
committer | Wolfram Sang <wsa@the-dreams.de> | 2016-01-10 03:27:53 -0500 |
commit | 2fe3e5189206f725b054e23b06762e50a7ab6276 (patch) | |
tree | 497cdad58df8c6e6e21dff84659ced3a52ca998c | |
parent | 9f924169c0358f630f9b6d26bb3de97360d8647b (diff) |
i2c: s3c2410: remove superfluous runtime PM calls
RuntimePM of the adapter device is now taken care of by the core. So, we
can remove these calls.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
-rw-r--r-- | drivers/i2c/busses/i2c-s3c2410.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c index 5df819610d52..362a6de54833 100644 --- a/drivers/i2c/busses/i2c-s3c2410.c +++ b/drivers/i2c/busses/i2c-s3c2410.c | |||
@@ -784,7 +784,6 @@ static int s3c24xx_i2c_xfer(struct i2c_adapter *adap, | |||
784 | int retry; | 784 | int retry; |
785 | int ret; | 785 | int ret; |
786 | 786 | ||
787 | pm_runtime_get_sync(&adap->dev); | ||
788 | ret = clk_enable(i2c->clk); | 787 | ret = clk_enable(i2c->clk); |
789 | if (ret) | 788 | if (ret) |
790 | return ret; | 789 | return ret; |
@@ -795,7 +794,6 @@ static int s3c24xx_i2c_xfer(struct i2c_adapter *adap, | |||
795 | 794 | ||
796 | if (ret != -EAGAIN) { | 795 | if (ret != -EAGAIN) { |
797 | clk_disable(i2c->clk); | 796 | clk_disable(i2c->clk); |
798 | pm_runtime_put(&adap->dev); | ||
799 | return ret; | 797 | return ret; |
800 | } | 798 | } |
801 | 799 | ||
@@ -805,7 +803,6 @@ static int s3c24xx_i2c_xfer(struct i2c_adapter *adap, | |||
805 | } | 803 | } |
806 | 804 | ||
807 | clk_disable(i2c->clk); | 805 | clk_disable(i2c->clk); |
808 | pm_runtime_put(&adap->dev); | ||
809 | return -EREMOTEIO; | 806 | return -EREMOTEIO; |
810 | } | 807 | } |
811 | 808 | ||
@@ -1256,8 +1253,6 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev) | |||
1256 | return ret; | 1253 | return ret; |
1257 | } | 1254 | } |
1258 | 1255 | ||
1259 | pm_runtime_enable(&i2c->adap.dev); | ||
1260 | |||
1261 | dev_info(&pdev->dev, "%s: S3C I2C adapter\n", dev_name(&i2c->adap.dev)); | 1256 | dev_info(&pdev->dev, "%s: S3C I2C adapter\n", dev_name(&i2c->adap.dev)); |
1262 | return 0; | 1257 | return 0; |
1263 | } | 1258 | } |
@@ -1273,7 +1268,6 @@ static int s3c24xx_i2c_remove(struct platform_device *pdev) | |||
1273 | 1268 | ||
1274 | clk_unprepare(i2c->clk); | 1269 | clk_unprepare(i2c->clk); |
1275 | 1270 | ||
1276 | pm_runtime_disable(&i2c->adap.dev); | ||
1277 | pm_runtime_disable(&pdev->dev); | 1271 | pm_runtime_disable(&pdev->dev); |
1278 | 1272 | ||
1279 | s3c24xx_i2c_deregister_cpufreq(i2c); | 1273 | s3c24xx_i2c_deregister_cpufreq(i2c); |