Re: [PATCH] mfd: adp5520: Use i2c_get_clientdata and dev_get_drvdataat appropriate places

From: Michael Hennerich
Date: Mon Mar 19 2012 - 04:50:52 EST


On 03/19/2012 08:08 AM, Axel Lin wrote:
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;


--
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


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/