Skip to content

L
linux
Commit 1b5420e1 authored by Geliang Tang's avatar Geliang Tang Committed by Lee Jones
Browse files
Options

mfd: Use to_i2c_client() instead of open-coding it 

Signed-off-by: default avatarGeliang Tang <geliangtang@163.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 5d1d147f
Show whitespace changes
Inline Side-by-side
Showing with 24 additions and 24 deletions
drivers/mfd/88pm80x.c
View file @ 1b5420e1
...@@ -135,7 +135,7 @@ EXPORT_SYMBOL_GPL(pm80x_deinit); ...@@ -135,7 +135,7 @@ EXPORT_SYMBOL_GPL(pm80x_deinit);
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_PM_SLEEP
static int pm80x_suspend(struct device *dev) static int pm80x_suspend(struct device *dev)
{ {
struct i2c_client *client = container_of(dev, struct i2c_client, dev); struct i2c_client *client = to_i2c_client(dev);
struct pm80x_chip *chip = i2c_get_clientdata(client); struct pm80x_chip *chip = i2c_get_clientdata(client);
if (chip && chip->wu_flag) if (chip && chip->wu_flag)
...@@ -147,7 +147,7 @@ static int pm80x_suspend(struct device *dev) ...@@ -147,7 +147,7 @@ static int pm80x_suspend(struct device *dev)
static int pm80x_resume(struct device *dev) static int pm80x_resume(struct device *dev)
{ {
struct i2c_client *client = container_of(dev, struct i2c_client, dev); struct i2c_client *client = to_i2c_client(dev);
struct pm80x_chip *chip = i2c_get_clientdata(client); struct pm80x_chip *chip = i2c_get_clientdata(client);
if (chip && chip->wu_flag) if (chip && chip->wu_flag)
......
drivers/mfd/88pm860x-core.c
View file @ 1b5420e1
...@@ -1218,7 +1218,7 @@ static int pm860x_remove(struct i2c_client *client) ...@@ -1218,7 +1218,7 @@ static int pm860x_remove(struct i2c_client *client)
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_PM_SLEEP
static int pm860x_suspend(struct device *dev) static int pm860x_suspend(struct device *dev)
{ {
struct i2c_client *client = container_of(dev, struct i2c_client, dev); struct i2c_client *client = to_i2c_client(dev);
struct pm860x_chip *chip = i2c_get_clientdata(client); struct pm860x_chip *chip = i2c_get_clientdata(client);
if (device_may_wakeup(dev) && chip->wakeup_flag) if (device_may_wakeup(dev) && chip->wakeup_flag)
...@@ -1228,7 +1228,7 @@ static int pm860x_suspend(struct device *dev) ...@@ -1228,7 +1228,7 @@ static int pm860x_suspend(struct device *dev)
static int pm860x_resume(struct device *dev) static int pm860x_resume(struct device *dev)
{ {
struct i2c_client *client = container_of(dev, struct i2c_client, dev); struct i2c_client *client = to_i2c_client(dev);
struct pm860x_chip *chip = i2c_get_clientdata(client); struct pm860x_chip *chip = i2c_get_clientdata(client);
if (device_may_wakeup(dev) && chip->wakeup_flag) if (device_may_wakeup(dev) && chip->wakeup_flag)
......
drivers/mfd/max14577.c
View file @ 1b5420e1
...@@ -495,7 +495,7 @@ MODULE_DEVICE_TABLE(i2c, max14577_i2c_id); ...@@ -495,7 +495,7 @@ MODULE_DEVICE_TABLE(i2c, max14577_i2c_id);
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_PM_SLEEP
static int max14577_suspend(struct device *dev) static int max14577_suspend(struct device *dev)
{ {
struct i2c_client *i2c = container_of(dev, struct i2c_client, dev); struct i2c_client *i2c = to_i2c_client(dev);
struct max14577 *max14577 = i2c_get_clientdata(i2c); struct max14577 *max14577 = i2c_get_clientdata(i2c);
if (device_may_wakeup(dev)) if (device_may_wakeup(dev))
...@@ -516,7 +516,7 @@ static int max14577_suspend(struct device *dev) ...@@ -516,7 +516,7 @@ static int max14577_suspend(struct device *dev)
static int max14577_resume(struct device *dev) static int max14577_resume(struct device *dev)
{ {
struct i2c_client *i2c = container_of(dev, struct i2c_client, dev); struct i2c_client *i2c = to_i2c_client(dev);
struct max14577 *max14577 = i2c_get_clientdata(i2c); struct max14577 *max14577 = i2c_get_clientdata(i2c);
if (device_may_wakeup(dev)) if (device_may_wakeup(dev))
......
drivers/mfd/max77686.c
View file @ 1b5420e1
...@@ -352,7 +352,7 @@ MODULE_DEVICE_TABLE(i2c, max77686_i2c_id); ...@@ -352,7 +352,7 @@ MODULE_DEVICE_TABLE(i2c, max77686_i2c_id);
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_PM_SLEEP
static int max77686_suspend(struct device *dev) static int max77686_suspend(struct device *dev)
{ {
struct i2c_client *i2c = container_of(dev, struct i2c_client, dev); struct i2c_client *i2c = to_i2c_client(dev);
struct max77686_dev *max77686 = i2c_get_clientdata(i2c); struct max77686_dev *max77686 = i2c_get_clientdata(i2c);
if (device_may_wakeup(dev)) if (device_may_wakeup(dev))
...@@ -374,7 +374,7 @@ static int max77686_suspend(struct device *dev) ...@@ -374,7 +374,7 @@ static int max77686_suspend(struct device *dev)
static int max77686_resume(struct device *dev) static int max77686_resume(struct device *dev)
{ {
struct i2c_client *i2c = container_of(dev, struct i2c_client, dev); struct i2c_client *i2c = to_i2c_client(dev);
struct max77686_dev *max77686 = i2c_get_clientdata(i2c); struct max77686_dev *max77686 = i2c_get_clientdata(i2c);
if (device_may_wakeup(dev)) if (device_may_wakeup(dev))
......
drivers/mfd/max77693.c
View file @ 1b5420e1
...@@ -334,7 +334,7 @@ MODULE_DEVICE_TABLE(i2c, max77693_i2c_id); ...@@ -334,7 +334,7 @@ MODULE_DEVICE_TABLE(i2c, max77693_i2c_id);
static int max77693_suspend(struct device *dev) static int max77693_suspend(struct device *dev)
{ {
struct i2c_client *i2c = container_of(dev, struct i2c_client, dev); struct i2c_client *i2c = to_i2c_client(dev);
struct max77693_dev *max77693 = i2c_get_clientdata(i2c); struct max77693_dev *max77693 = i2c_get_clientdata(i2c);
if (device_may_wakeup(dev)) { if (device_may_wakeup(dev)) {
...@@ -347,7 +347,7 @@ static int max77693_suspend(struct device *dev) ...@@ -347,7 +347,7 @@ static int max77693_suspend(struct device *dev)
static int max77693_resume(struct device *dev) static int max77693_resume(struct device *dev)
{ {
struct i2c_client *i2c = container_of(dev, struct i2c_client, dev); struct i2c_client *i2c = to_i2c_client(dev);
struct max77693_dev *max77693 = i2c_get_clientdata(i2c); struct max77693_dev *max77693 = i2c_get_clientdata(i2c);
if (device_may_wakeup(dev)) { if (device_may_wakeup(dev)) {
......
drivers/mfd/max77843.c
View file @ 1b5420e1
...@@ -197,7 +197,7 @@ MODULE_DEVICE_TABLE(i2c, max77843_id); ...@@ -197,7 +197,7 @@ MODULE_DEVICE_TABLE(i2c, max77843_id);
static int __maybe_unused max77843_suspend(struct device *dev) static int __maybe_unused max77843_suspend(struct device *dev)
{ {
struct i2c_client *i2c = container_of(dev, struct i2c_client, dev); struct i2c_client *i2c = to_i2c_client(dev);
struct max77693_dev *max77843 = i2c_get_clientdata(i2c); struct max77693_dev *max77843 = i2c_get_clientdata(i2c);
disable_irq(max77843->irq); disable_irq(max77843->irq);
...@@ -209,7 +209,7 @@ static int __maybe_unused max77843_suspend(struct device *dev) ...@@ -209,7 +209,7 @@ static int __maybe_unused max77843_suspend(struct device *dev)
static int __maybe_unused max77843_resume(struct device *dev) static int __maybe_unused max77843_resume(struct device *dev)
{ {
struct i2c_client *i2c = container_of(dev, struct i2c_client, dev); struct i2c_client *i2c = to_i2c_client(dev);
struct max77693_dev *max77843 = i2c_get_clientdata(i2c); struct max77693_dev *max77843 = i2c_get_clientdata(i2c);
if (device_may_wakeup(dev)) if (device_may_wakeup(dev))
......
drivers/mfd/max8925-i2c.c
View file @ 1b5420e1
...@@ -215,7 +215,7 @@ static int max8925_remove(struct i2c_client *client) ...@@ -215,7 +215,7 @@ static int max8925_remove(struct i2c_client *client)
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_PM_SLEEP
static int max8925_suspend(struct device *dev) static int max8925_suspend(struct device *dev)
{ {
struct i2c_client *client = container_of(dev, struct i2c_client, dev); struct i2c_client *client = to_i2c_client(dev);
struct max8925_chip *chip = i2c_get_clientdata(client); struct max8925_chip *chip = i2c_get_clientdata(client);
if (device_may_wakeup(dev) && chip->wakeup_flag) if (device_may_wakeup(dev) && chip->wakeup_flag)
...@@ -225,7 +225,7 @@ static int max8925_suspend(struct device *dev) ...@@ -225,7 +225,7 @@ static int max8925_suspend(struct device *dev)
static int max8925_resume(struct device *dev) static int max8925_resume(struct device *dev)
{ {
struct i2c_client *client = container_of(dev, struct i2c_client, dev); struct i2c_client *client = to_i2c_client(dev);
struct max8925_chip *chip = i2c_get_clientdata(client); struct max8925_chip *chip = i2c_get_clientdata(client);
if (device_may_wakeup(dev) && chip->wakeup_flag) if (device_may_wakeup(dev) && chip->wakeup_flag)
......
drivers/mfd/max8997.c
View file @ 1b5420e1
...@@ -437,7 +437,7 @@ static u8 max8997_dumpaddr_haptic[] = { ...@@ -437,7 +437,7 @@ static u8 max8997_dumpaddr_haptic[] = {
static int max8997_freeze(struct device *dev) static int max8997_freeze(struct device *dev)
{ {
struct i2c_client *i2c = container_of(dev, struct i2c_client, dev); struct i2c_client *i2c = to_i2c_client(dev);
struct max8997_dev *max8997 = i2c_get_clientdata(i2c); struct max8997_dev *max8997 = i2c_get_clientdata(i2c);
int i; int i;
...@@ -459,7 +459,7 @@ static int max8997_freeze(struct device *dev) ...@@ -459,7 +459,7 @@ static int max8997_freeze(struct device *dev)
static int max8997_restore(struct device *dev) static int max8997_restore(struct device *dev)
{ {
struct i2c_client *i2c = container_of(dev, struct i2c_client, dev); struct i2c_client *i2c = to_i2c_client(dev);
struct max8997_dev *max8997 = i2c_get_clientdata(i2c); struct max8997_dev *max8997 = i2c_get_clientdata(i2c);
int i; int i;
...@@ -481,7 +481,7 @@ static int max8997_restore(struct device *dev) ...@@ -481,7 +481,7 @@ static int max8997_restore(struct device *dev)
static int max8997_suspend(struct device *dev) static int max8997_suspend(struct device *dev)
{ {
struct i2c_client *i2c = container_of(dev, struct i2c_client, dev); struct i2c_client *i2c = to_i2c_client(dev);
struct max8997_dev *max8997 = i2c_get_clientdata(i2c); struct max8997_dev *max8997 = i2c_get_clientdata(i2c);
if (device_may_wakeup(dev)) if (device_may_wakeup(dev))
...@@ -491,7 +491,7 @@ static int max8997_suspend(struct device *dev) ...@@ -491,7 +491,7 @@ static int max8997_suspend(struct device *dev)
static int max8997_resume(struct device *dev) static int max8997_resume(struct device *dev)
{ {
struct i2c_client *i2c = container_of(dev, struct i2c_client, dev); struct i2c_client *i2c = to_i2c_client(dev);
struct max8997_dev *max8997 = i2c_get_clientdata(i2c); struct max8997_dev *max8997 = i2c_get_clientdata(i2c);
if (device_may_wakeup(dev)) if (device_may_wakeup(dev))
......
drivers/mfd/max8998.c
View file @ 1b5420e1
...@@ -274,7 +274,7 @@ MODULE_DEVICE_TABLE(i2c, max8998_i2c_id); ...@@ -274,7 +274,7 @@ MODULE_DEVICE_TABLE(i2c, max8998_i2c_id);
static int max8998_suspend(struct device *dev) static int max8998_suspend(struct device *dev)
{ {
struct i2c_client *i2c = container_of(dev, struct i2c_client, dev); struct i2c_client *i2c = to_i2c_client(dev);
struct max8998_dev *max8998 = i2c_get_clientdata(i2c); struct max8998_dev *max8998 = i2c_get_clientdata(i2c);
if (device_may_wakeup(dev)) if (device_may_wakeup(dev))
...@@ -284,7 +284,7 @@ static int max8998_suspend(struct device *dev) ...@@ -284,7 +284,7 @@ static int max8998_suspend(struct device *dev)
static int max8998_resume(struct device *dev) static int max8998_resume(struct device *dev)
{ {
struct i2c_client *i2c = container_of(dev, struct i2c_client, dev); struct i2c_client *i2c = to_i2c_client(dev);
struct max8998_dev *max8998 = i2c_get_clientdata(i2c); struct max8998_dev *max8998 = i2c_get_clientdata(i2c);
if (device_may_wakeup(dev)) if (device_may_wakeup(dev))
...@@ -344,7 +344,7 @@ static struct max8998_reg_dump max8998_dump[] = { ...@@ -344,7 +344,7 @@ static struct max8998_reg_dump max8998_dump[] = {
/* Save registers before hibernation */ /* Save registers before hibernation */
static int max8998_freeze(struct device *dev) static int max8998_freeze(struct device *dev)
{ {
struct i2c_client *i2c = container_of(dev, struct i2c_client, dev); struct i2c_client *i2c = to_i2c_client(dev);
int i; int i;
for (i = 0; i < ARRAY_SIZE(max8998_dump); i++) for (i = 0; i < ARRAY_SIZE(max8998_dump); i++)
...@@ -357,7 +357,7 @@ static int max8998_freeze(struct device *dev) ...@@ -357,7 +357,7 @@ static int max8998_freeze(struct device *dev)
/* Restore registers after hibernation */ /* Restore registers after hibernation */
static int max8998_restore(struct device *dev) static int max8998_restore(struct device *dev)
{ {
struct i2c_client *i2c = container_of(dev, struct i2c_client, dev); struct i2c_client *i2c = to_i2c_client(dev);
int i; int i;
for (i = 0; i < ARRAY_SIZE(max8998_dump); i++) for (i = 0; i < ARRAY_SIZE(max8998_dump); i++)
......
drivers/mfd/sec-core.c
View file @ 1b5420e1
...@@ -536,7 +536,7 @@ static void sec_pmic_shutdown(struct i2c_client *i2c) ...@@ -536,7 +536,7 @@ static void sec_pmic_shutdown(struct i2c_client *i2c)
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_PM_SLEEP
static int sec_pmic_suspend(struct device *dev) static int sec_pmic_suspend(struct device *dev)
{ {
struct i2c_client *i2c = container_of(dev, struct i2c_client, dev); struct i2c_client *i2c = to_i2c_client(dev);
struct sec_pmic_dev *sec_pmic = i2c_get_clientdata(i2c); struct sec_pmic_dev *sec_pmic = i2c_get_clientdata(i2c);
if (device_may_wakeup(dev)) if (device_may_wakeup(dev))
...@@ -557,7 +557,7 @@ static int sec_pmic_suspend(struct device *dev) ...@@ -557,7 +557,7 @@ static int sec_pmic_suspend(struct device *dev)
static int sec_pmic_resume(struct device *dev) static int sec_pmic_resume(struct device *dev)
{ {
struct i2c_client *i2c = container_of(dev, struct i2c_client, dev); struct i2c_client *i2c = to_i2c_client(dev);
struct sec_pmic_dev *sec_pmic = i2c_get_clientdata(i2c); struct sec_pmic_dev *sec_pmic = i2c_get_clientdata(i2c);
if (device_may_wakeup(dev)) if (device_may_wakeup(dev))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7