Skip to contentSkip to conversation

mfd: adp5520: Use i2c_get_clientdata and dev_get_drvdata at appropriate places

PATCH In review Axel Lin 2 participants 2 messages Mar 19, 2012

Subsystems (2)
Multifunction devices (MFD) ADP5520 backlight driver with io expander (ADP5520/ADP5501)
lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/1 mfd: adp5520: Use i2c_get_clientdata and dev_get_drvdata at appropriate places

Signed-off-by Axel Lin <[email protected]>
---
 drivers/mfd/adp5520.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)
drivers/mfd/adp5520.c +3 -5
index 8d816cc..1a7e22e 100644
@@ -309,7 +309,7 @@ out_free_chip:
 
 static int __devexit adp5520_remove(struct i2c_client *client)
 {
-	struct adp5520_chip *chip = dev_get_drvdata(&client->dev);
+	struct adp5520_chip *chip = i2c_get_clientdata(client);
 
 	if (chip->irq)
 		free_irq(chip->irq, chip);

@@ -323,8 +323,7 @@ static int __devexit adp5520_remove(struct i2c_client *client)
 #ifdef CONFIG_PM
 static int adp5520_suspend(struct device *dev)
 {
-	struct i2c_client *client = to_i2c_client(dev);
-	struct adp5520_chip *chip = dev_get_drvdata(&client->dev);
+	struct adp5520_chip *chip = dev_get_drvdata(dev);
 
 	adp5520_clr_bits(chip->dev, ADP5520_MODE_STATUS, ADP5520_nSTNBY);
 	return 0;

@@ -332,8 +331,7 @@ static int adp5520_suspend(struct device *dev)
 
 static int adp5520_resume(struct device *dev)
 {
-	struct i2c_client *client = to_i2c_client(dev);
-	struct adp5520_chip *chip = dev_get_drvdata(&client->dev);
+	struct adp5520_chip *chip = dev_get_drvdata(dev);
 
 	adp5520_set_bits(chip->dev, ADP5520_MODE_STATUS, ADP5520_nSTNBY);
 	return 0;
Signature · 1 line
1.7.5.4
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 1 line · Axel Lin
Signed-off-by Axel Lin<[email protected]>
Acked-by Michael Hennerich <[email protected]>
Quoted 37 lines
---
  drivers/mfd/adp5520.c |    8 +++-----
  1 files changed, 3 insertions(+), 5 deletions(-)
drivers/mfd/adp5520.c +3 -5
index 8d816cc..1a7e22e 100644
@@ -309,7 +309,7 @@ out_free_chip:
 
  static int __devexit adp5520_remove(struct i2c_client *client)
  {
-	struct adp5520_chip *chip = dev_get_drvdata(&client->dev);
+	struct adp5520_chip *chip = i2c_get_clientdata(client);
 
  	if (chip->irq)
  		free_irq(chip->irq, chip);

@@ -323,8 +323,7 @@ static int __devexit adp5520_remove(struct i2c_client *client)
  #ifdef CONFIG_PM
  static int adp5520_suspend(struct device *dev)
  {
-	struct i2c_client *client = to_i2c_client(dev);
-	struct adp5520_chip *chip = dev_get_drvdata(&client->dev);
+	struct adp5520_chip *chip = dev_get_drvdata(dev);
 
  	adp5520_clr_bits(chip->dev, ADP5520_MODE_STATUS, ADP5520_nSTNBY);
  	return 0;

@@ -332,8 +331,7 @@ static int adp5520_suspend(struct device *dev)
 
  static int adp5520_resume(struct device *dev)
  {
-	struct i2c_client *client = to_i2c_client(dev);
-	struct adp5520_chip *chip = dev_get_drvdata(&client->dev);
+	struct adp5520_chip *chip = dev_get_drvdata(dev);
 
  	adp5520_set_bits(chip->dev, ADP5520_MODE_STATUS, ADP5520_nSTNBY);
  	return 0;
Signature · 8 lines
Greetings,
Michael

--
Analog Devices GmbH      Wilhelm-Wagenfeld-Str. 6      80807 Muenchen
Sitz der Gesellschaft: Muenchen; Registergericht: Muenchen HRB 40368;
Geschaeftsfuehrer:Dr.Carsten Suckrow, Thomas Wessel, William A. Martin,
Margaret Seif