Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c99d8e6 authored by Geliang Tang's avatar Geliang Tang Committed by Greg Kroah-Hartman
Browse files

misc: apds990x, bh1770glc, lis3lv02d: use to_i2c_client 



Use to_i2c_client() instead of open-coding it.

Signed-off-by: default avatarGeliang Tang <geliangtang@163.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 50e6315d

drivers/misc/apds990x.c

+4 −4
Original line number Diff line number Diff line
@@ -1215,7 +1215,7 @@ static int apds990x_remove(struct i2c_client *client) 
#ifdef CONFIG_PM_SLEEP

static int apds990x_suspend(struct device *dev)

{

	struct i2c_client *client = container_of(dev, struct i2c_client, dev);

	struct i2c_client *client = to_i2c_client(dev);

	struct apds990x_chip *chip = i2c_get_clientdata(client);



	apds990x_chip_off(chip);
@@ -1224,7 +1224,7 @@ static int apds990x_suspend(struct device *dev) 


static int apds990x_resume(struct device *dev)

{

	struct i2c_client *client = container_of(dev, struct i2c_client, dev);

	struct i2c_client *client = to_i2c_client(dev);

	struct apds990x_chip *chip = i2c_get_clientdata(client);



	/*
@@ -1240,7 +1240,7 @@ static int apds990x_resume(struct device *dev) 
#ifdef CONFIG_PM

static int apds990x_runtime_suspend(struct device *dev)

{

	struct i2c_client *client = container_of(dev, struct i2c_client, dev);

	struct i2c_client *client = to_i2c_client(dev);

	struct apds990x_chip *chip = i2c_get_clientdata(client);



	apds990x_chip_off(chip);
@@ -1249,7 +1249,7 @@ static int apds990x_runtime_suspend(struct device *dev) 


static int apds990x_runtime_resume(struct device *dev)

{

	struct i2c_client *client = container_of(dev, struct i2c_client, dev);

	struct i2c_client *client = to_i2c_client(dev);

	struct apds990x_chip *chip = i2c_get_clientdata(client);



	apds990x_chip_on(chip);

drivers/misc/bh1770glc.c

+4 −4
Original line number Diff line number Diff line
@@ -1323,7 +1323,7 @@ static int bh1770_remove(struct i2c_client *client) 
#ifdef CONFIG_PM_SLEEP

static int bh1770_suspend(struct device *dev)

{

	struct i2c_client *client = container_of(dev, struct i2c_client, dev);

	struct i2c_client *client = to_i2c_client(dev);

	struct bh1770_chip *chip = i2c_get_clientdata(client);



	bh1770_chip_off(chip);
@@ -1333,7 +1333,7 @@ static int bh1770_suspend(struct device *dev) 


static int bh1770_resume(struct device *dev)

{

	struct i2c_client *client = container_of(dev, struct i2c_client, dev);

	struct i2c_client *client = to_i2c_client(dev);

	struct bh1770_chip *chip = i2c_get_clientdata(client);

	int ret = 0;
@@ -1361,7 +1361,7 @@ static int bh1770_resume(struct device *dev) 
#ifdef CONFIG_PM

static int bh1770_runtime_suspend(struct device *dev)

{

	struct i2c_client *client = container_of(dev, struct i2c_client, dev);

	struct i2c_client *client = to_i2c_client(dev);

	struct bh1770_chip *chip = i2c_get_clientdata(client);



	bh1770_chip_off(chip);
@@ -1371,7 +1371,7 @@ static int bh1770_runtime_suspend(struct device *dev) 


static int bh1770_runtime_resume(struct device *dev)

{

	struct i2c_client *client = container_of(dev, struct i2c_client, dev);

	struct i2c_client *client = to_i2c_client(dev);

	struct bh1770_chip *chip = i2c_get_clientdata(client);



	bh1770_chip_on(chip);

drivers/misc/lis3lv02d/lis3lv02d_i2c.c

+4 −4
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ static int lis3lv02d_i2c_remove(struct i2c_client *client) 
#ifdef CONFIG_PM_SLEEP

static int lis3lv02d_i2c_suspend(struct device *dev)

{

	struct i2c_client *client = container_of(dev, struct i2c_client, dev);

	struct i2c_client *client = to_i2c_client(dev);

	struct lis3lv02d *lis3 = i2c_get_clientdata(client);



	if (!lis3->pdata || !lis3->pdata->wakeup_flags)
@@ -219,7 +219,7 @@ static int lis3lv02d_i2c_suspend(struct device *dev) 


static int lis3lv02d_i2c_resume(struct device *dev)

{

	struct i2c_client *client = container_of(dev, struct i2c_client, dev);

	struct i2c_client *client = to_i2c_client(dev);

	struct lis3lv02d *lis3 = i2c_get_clientdata(client);



	/*
@@ -238,7 +238,7 @@ static int lis3lv02d_i2c_resume(struct device *dev) 
#ifdef CONFIG_PM

static int lis3_i2c_runtime_suspend(struct device *dev)

{

	struct i2c_client *client = container_of(dev, struct i2c_client, dev);

	struct i2c_client *client = to_i2c_client(dev);

	struct lis3lv02d *lis3 = i2c_get_clientdata(client);



	lis3lv02d_poweroff(lis3);
@@ -247,7 +247,7 @@ static int lis3_i2c_runtime_suspend(struct device *dev) 


static int lis3_i2c_runtime_resume(struct device *dev)

{

	struct i2c_client *client = container_of(dev, struct i2c_client, dev);

	struct i2c_client *client = to_i2c_client(dev);

	struct lis3lv02d *lis3 = i2c_get_clientdata(client);



	lis3lv02d_poweron(lis3);