extcon: Use to_i2c_client for both rt8973a and sm5502

geliangtang · chanwoochoi · commit d58593426e5c · 2016-01-25T13:16:53.000+09:00
Use to_i2c_client() instead of open-coding it.

Signed-off-by: Geliang Tang &lt;geliangtang@163.com&gt;
Signed-off-by: Chanwoo Choi &lt;cw00.choi@samsung.com&gt;
diff --git a/drivers/extcon/extcon-rt8973a.c b/drivers/extcon/extcon-rt8973a.c
@@ -663,7 +663,7 @@ MODULE_DEVICE_TABLE(of, rt8973a_dt_match);
 #ifdef CONFIG_PM_SLEEP
 static int rt8973a_muic_suspend(struct device *dev)
 {
-	struct i2c_client *i2c = container_of(dev, struct i2c_client, dev);
+	struct i2c_client *i2c = to_i2c_client(dev);
 	struct rt8973a_muic_info *info = i2c_get_clientdata(i2c);
 
 	enable_irq_wake(info->irq);
@@ -673,7 +673,7 @@ static int rt8973a_muic_suspend(struct device *dev)
 
 static int rt8973a_muic_resume(struct device *dev)
 {
-	struct i2c_client *i2c = container_of(dev, struct i2c_client, dev);
+	struct i2c_client *i2c = to_i2c_client(dev);
 	struct rt8973a_muic_info *info = i2c_get_clientdata(i2c);
 
 	disable_irq_wake(info->irq);
diff --git a/drivers/extcon/extcon-sm5502.c b/drivers/extcon/extcon-sm5502.c
@@ -655,7 +655,7 @@ MODULE_DEVICE_TABLE(of, sm5502_dt_match);
 #ifdef CONFIG_PM_SLEEP
 static int sm5502_muic_suspend(struct device *dev)
 {
-	struct i2c_client *i2c = container_of(dev, struct i2c_client, dev);
+	struct i2c_client *i2c = to_i2c_client(dev);
 	struct sm5502_muic_info *info = i2c_get_clientdata(i2c);
 
 	enable_irq_wake(info->irq);
@@ -665,7 +665,7 @@ static int sm5502_muic_suspend(struct device *dev)
 
 static int sm5502_muic_resume(struct device *dev)
 {
-	struct i2c_client *i2c = container_of(dev, struct i2c_client, dev);
+	struct i2c_client *i2c = to_i2c_client(dev);
 	struct sm5502_muic_info *info = i2c_get_clientdata(i2c);
 
 	disable_irq_wake(info->irq);

Original file line number	Diff line number	Diff line change
`@@ -663,7 +663,7 @@ MODULE_DEVICE_TABLE(of, rt8973a_dt_match);`
`663`	`663`	`#ifdef CONFIG_PM_SLEEP`
`664`	`664`	`static int rt8973a_muic_suspend(struct device *dev)`
`665`	`665`	`{`
`666`		`- struct i2c_client *i2c = container_of(dev, struct i2c_client, dev);`
	`666`	`+ struct i2c_client *i2c = to_i2c_client(dev);`
`667`	`667`	`struct rt8973a_muic_info *info = i2c_get_clientdata(i2c);`
`668`	`668`
`669`	`669`	`enable_irq_wake(info->irq);`
`@@ -673,7 +673,7 @@ static int rt8973a_muic_suspend(struct device *dev)`
`673`	`673`
`674`	`674`	`static int rt8973a_muic_resume(struct device *dev)`
`675`	`675`	`{`
`676`		`- struct i2c_client *i2c = container_of(dev, struct i2c_client, dev);`
	`676`	`+ struct i2c_client *i2c = to_i2c_client(dev);`
`677`	`677`	`struct rt8973a_muic_info *info = i2c_get_clientdata(i2c);`
`678`	`678`
`679`	`679`	`disable_irq_wake(info->irq);`
Original file line number	Diff line number	Diff line change
`@@ -655,7 +655,7 @@ MODULE_DEVICE_TABLE(of, sm5502_dt_match);`
`655`	`655`	`#ifdef CONFIG_PM_SLEEP`
`656`	`656`	`static int sm5502_muic_suspend(struct device *dev)`
`657`	`657`	`{`
`658`		`- struct i2c_client *i2c = container_of(dev, struct i2c_client, dev);`
	`658`	`+ struct i2c_client *i2c = to_i2c_client(dev);`
`659`	`659`	`struct sm5502_muic_info *info = i2c_get_clientdata(i2c);`
`660`	`660`
`661`	`661`	`enable_irq_wake(info->irq);`
`@@ -665,7 +665,7 @@ static int sm5502_muic_suspend(struct device *dev)`
`665`	`665`
`666`	`666`	`static int sm5502_muic_resume(struct device *dev)`
`667`	`667`	`{`
`668`		`- struct i2c_client *i2c = container_of(dev, struct i2c_client, dev);`
	`668`	`+ struct i2c_client *i2c = to_i2c_client(dev);`
`669`	`669`	`struct sm5502_muic_info *info = i2c_get_clientdata(i2c);`
`670`	`670`
`671`	`671`	`disable_irq_wake(info->irq);`