i2c: sprd: don't use pdev as variable name for struct device *

Wolfram Sang · Wolfram Sang · commit 7b6b69984e04 · 2019-01-08T21:02:50.000+01:00
The pointer to a device is usually named 'dev'. These 'pdev' here look
much like copy&amp;paste errors. Fix them to avoid confusion.

Signed-off-by: Wolfram Sang &lt;wsa+renesas@sang-engineering.com&gt;
Reviewed-by: Baolin Wang &lt;baolin.wang@linaro.org&gt;
Signed-off-by: Wolfram Sang &lt;wsa@the-dreams.de&gt;
diff --git a/drivers/i2c/busses/i2c-sprd.c b/drivers/i2c/busses/i2c-sprd.c
@@ -586,40 +586,40 @@ static int sprd_i2c_remove(struct platform_device *pdev)
 	return 0;
 }
 
-static int __maybe_unused sprd_i2c_suspend_noirq(struct device *pdev)
+static int __maybe_unused sprd_i2c_suspend_noirq(struct device *dev)
 {
-	struct sprd_i2c *i2c_dev = dev_get_drvdata(pdev);
+	struct sprd_i2c *i2c_dev = dev_get_drvdata(dev);
 
 	i2c_lock_bus(&i2c_dev->adap, I2C_LOCK_ROOT_ADAPTER);
 	i2c_dev->is_suspended = true;
 	i2c_unlock_bus(&i2c_dev->adap, I2C_LOCK_ROOT_ADAPTER);
 
-	return pm_runtime_force_suspend(pdev);
+	return pm_runtime_force_suspend(dev);
 }
 
-static int __maybe_unused sprd_i2c_resume_noirq(struct device *pdev)
+static int __maybe_unused sprd_i2c_resume_noirq(struct device *dev)
 {
-	struct sprd_i2c *i2c_dev = dev_get_drvdata(pdev);
+	struct sprd_i2c *i2c_dev = dev_get_drvdata(dev);
 
 	i2c_lock_bus(&i2c_dev->adap, I2C_LOCK_ROOT_ADAPTER);
 	i2c_dev->is_suspended = false;
 	i2c_unlock_bus(&i2c_dev->adap, I2C_LOCK_ROOT_ADAPTER);
 
-	return pm_runtime_force_resume(pdev);
+	return pm_runtime_force_resume(dev);
 }
 
-static int __maybe_unused sprd_i2c_runtime_suspend(struct device *pdev)
+static int __maybe_unused sprd_i2c_runtime_suspend(struct device *dev)
 {
-	struct sprd_i2c *i2c_dev = dev_get_drvdata(pdev);
+	struct sprd_i2c *i2c_dev = dev_get_drvdata(dev);
 
 	clk_disable_unprepare(i2c_dev->clk);
 
 	return 0;
 }
 
-static int __maybe_unused sprd_i2c_runtime_resume(struct device *pdev)
+static int __maybe_unused sprd_i2c_runtime_resume(struct device *dev)
 {
-	struct sprd_i2c *i2c_dev = dev_get_drvdata(pdev);
+	struct sprd_i2c *i2c_dev = dev_get_drvdata(dev);
 	int ret;
 
 	ret = clk_prepare_enable(i2c_dev->clk);

Original file line number	Diff line number	Diff line change
`@@ -586,40 +586,40 @@ static int sprd_i2c_remove(struct platform_device *pdev)`
`586`	`586`	`return 0;`
`587`	`587`	`}`
`588`	`588`
`589`		`-static int __maybe_unused sprd_i2c_suspend_noirq(struct device *pdev)`
	`589`	`+static int __maybe_unused sprd_i2c_suspend_noirq(struct device *dev)`
`590`	`590`	`{`
`591`		`- struct sprd_i2c *i2c_dev = dev_get_drvdata(pdev);`
	`591`	`+ struct sprd_i2c *i2c_dev = dev_get_drvdata(dev);`
`592`	`592`
`593`	`593`	`i2c_lock_bus(&i2c_dev->adap, I2C_LOCK_ROOT_ADAPTER);`
`594`	`594`	`i2c_dev->is_suspended = true;`
`595`	`595`	`i2c_unlock_bus(&i2c_dev->adap, I2C_LOCK_ROOT_ADAPTER);`
`596`	`596`
`597`		`- return pm_runtime_force_suspend(pdev);`
	`597`	`+ return pm_runtime_force_suspend(dev);`
`598`	`598`	`}`
`599`	`599`
`600`		`-static int __maybe_unused sprd_i2c_resume_noirq(struct device *pdev)`
	`600`	`+static int __maybe_unused sprd_i2c_resume_noirq(struct device *dev)`
`601`	`601`	`{`
`602`		`- struct sprd_i2c *i2c_dev = dev_get_drvdata(pdev);`
	`602`	`+ struct sprd_i2c *i2c_dev = dev_get_drvdata(dev);`
`603`	`603`
`604`	`604`	`i2c_lock_bus(&i2c_dev->adap, I2C_LOCK_ROOT_ADAPTER);`
`605`	`605`	`i2c_dev->is_suspended = false;`
`606`	`606`	`i2c_unlock_bus(&i2c_dev->adap, I2C_LOCK_ROOT_ADAPTER);`
`607`	`607`
`608`		`- return pm_runtime_force_resume(pdev);`
	`608`	`+ return pm_runtime_force_resume(dev);`
`609`	`609`	`}`
`610`	`610`
`611`		`-static int __maybe_unused sprd_i2c_runtime_suspend(struct device *pdev)`
	`611`	`+static int __maybe_unused sprd_i2c_runtime_suspend(struct device *dev)`
`612`	`612`	`{`
`613`		`- struct sprd_i2c *i2c_dev = dev_get_drvdata(pdev);`
	`613`	`+ struct sprd_i2c *i2c_dev = dev_get_drvdata(dev);`
`614`	`614`
`615`	`615`	`clk_disable_unprepare(i2c_dev->clk);`
`616`	`616`
`617`	`617`	`return 0;`
`618`	`618`	`}`
`619`	`619`
`620`		`-static int __maybe_unused sprd_i2c_runtime_resume(struct device *pdev)`
	`620`	`+static int __maybe_unused sprd_i2c_runtime_resume(struct device *dev)`
`621`	`621`	`{`
`622`		`- struct sprd_i2c *i2c_dev = dev_get_drvdata(pdev);`
	`622`	`+ struct sprd_i2c *i2c_dev = dev_get_drvdata(dev);`
`623`	`623`	`int ret;`
`624`	`624`
`625`	`625`	`ret = clk_prepare_enable(i2c_dev->clk);`