Commit a181b8d1 authored by Minghao Chi's avatar Minghao Chi Committed by Wolfram Sang
Browse files

i2c: davinci: using pm_runtime_resume_and_get instead of pm_runtime_get_sync 



Using pm_runtime_resume_and_get() to replace pm_runtime_get_sync and
pm_runtime_put_noidle. This change is just to simplify the code, no
actual functional changes.

Reported-by: default avatarZeal Robot <zealci@zte.com.cn>
Signed-off-by: default avatarMinghao Chi <chi.minghao@zte.com.cn>
Reviewed-by: default avatarBartosz Golaszewski <brgl@bgdev.pl>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
parent 5692900b

drivers/i2c/busses/i2c-davinci.c

+4 −8
Original line number Diff line number Diff line
@@ -539,10 +539,9 @@ i2c_davinci_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num) 


	dev_dbg(dev->dev, "%s: msgs: %d\n", __func__, num);



	ret = pm_runtime_get_sync(dev->dev);

	ret = pm_runtime_resume_and_get(dev->dev);

	if (ret < 0) {

		dev_err(dev->dev, "Failed to runtime_get device: %d\n", ret);

		pm_runtime_put_noidle(dev->dev);

		return ret;

	}
@@ -821,10 +820,9 @@ static int davinci_i2c_probe(struct platform_device *pdev) 


	pm_runtime_enable(dev->dev);



	r = pm_runtime_get_sync(dev->dev);

	r = pm_runtime_resume_and_get(dev->dev);

	if (r < 0) {

		dev_err(dev->dev, "failed to runtime_get device: %d\n", r);

		pm_runtime_put_noidle(dev->dev);

		return r;

	}
@@ -898,11 +896,9 @@ static int davinci_i2c_remove(struct platform_device *pdev) 


	i2c_del_adapter(&dev->adapter);



	ret = pm_runtime_get_sync(&pdev->dev);

	if (ret < 0) {

		pm_runtime_put_noidle(&pdev->dev);

	ret = pm_runtime_resume_and_get(&pdev->dev);

	if (ret < 0)

		return ret;

	}



	davinci_i2c_write_reg(dev, DAVINCI_I2C_MDR_REG, 0);