public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] mfd: adp5520: Use i2c_get_clientdata and dev_get_drvdata at appropriate places
@ 2012-03-19  7:08 Axel Lin
  2012-03-19  8:50 ` Michael Hennerich
  0 siblings, 1 reply; 2+ messages in thread
From: Axel Lin @ 2012-03-19  7:08 UTC (permalink / raw)
  To: linux-kernel; +Cc: Michael Hennerich, Samuel Ortiz, device-drivers-devel

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




^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] mfd: adp5520: Use i2c_get_clientdata and dev_get_drvdata at appropriate places
  2012-03-19  7:08 [PATCH] mfd: adp5520: Use i2c_get_clientdata and dev_get_drvdata at appropriate places Axel Lin
@ 2012-03-19  8:50 ` Michael Hennerich
  0 siblings, 0 replies; 2+ messages in thread
From: Michael Hennerich @ 2012-03-19  8:50 UTC (permalink / raw)
  To: Axel Lin
  Cc: linux-kernel@vger.kernel.org, Michael Hennerich, Samuel Ortiz,
	device-drivers-devel@blackfin.uclinux.org

On 03/19/2012 08:08 AM, Axel Lin wrote:
> Signed-off-by: Axel Lin<axel.lin@gmail.com>
Acked-by: Michael Hennerich <michael.hennerich@analog.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;


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



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-03-19  8:50 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-19  7:08 [PATCH] mfd: adp5520: Use i2c_get_clientdata and dev_get_drvdata at appropriate places Axel Lin
2012-03-19  8:50 ` Michael Hennerich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox