All of lore.kernel.org
 help / color / mirror / Atom feed
From: Axel Lin <axel.lin@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: Michael Hennerich <hennerich@blackfin.uclinux.org>,
	Samuel Ortiz <sameo@linux.intel.com>,
	device-drivers-devel@blackfin.uclinux.org
Subject: [PATCH] mfd: adp5520: Use i2c_get_clientdata and dev_get_drvdata at appropriate places
Date: Mon, 19 Mar 2012 15:08:58 +0800	[thread overview]
Message-ID: <1332140938.10116.0.camel@phoenix> (raw)

Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
 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;
-- 
1.7.5.4




             reply	other threads:[~2012-03-19  7:09 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-03-19  7:08 Axel Lin [this message]
2012-03-19  8:50 ` [PATCH] mfd: adp5520: Use i2c_get_clientdata and dev_get_drvdata at appropriate places Michael Hennerich

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1332140938.10116.0.camel@phoenix \
    --to=axel.lin@gmail.com \
    --cc=device-drivers-devel@blackfin.uclinux.org \
    --cc=hennerich@blackfin.uclinux.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=sameo@linux.intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.