Signed-off-by: Axel Lin<axel.lin@xxxxxxxxx>Acked-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
---
drivers/mfd/adp5520.c | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/mfd/adp5520.c b/drivers/mfd/adp5520.c
index 8d816cc..1a7e22e 100644
--- a/drivers/mfd/adp5520.c
+++ b/drivers/mfd/adp5520.c
@@ -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;