Skip to content

Commit 0494499

Browse files
srelag-linaro
authored andcommitted
mfd: rk808: Replace 'struct i2c_client' with 'struct device'
Put 'struct device' pointer into the MFD platform_data instead of the 'struct i2c_client' pointer. This simplifies the code and prepares the MFD for SPI support. Tested-by: Diederik de Haas <didi.debian@cknow.org> # Rock64, Quartz64 Model A + B Tested-by: Vincent Legoll <vincent.legoll@gmail.com> # Pine64 QuartzPro64 Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com> Link: https://lore.kernel.org/r/20230504173618.142075-5-sebastian.reichel@collabora.com Signed-off-by: Lee Jones <lee@kernel.org>
1 parent e714b50 commit 0494499

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

drivers/mfd/rk808.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -577,7 +577,7 @@ static int rk808_power_off(struct sys_off_data *data)
577577
}
578578
ret = regmap_update_bits(rk808->regmap, reg, bit, bit);
579579
if (ret)
580-
dev_err(&rk808->i2c->dev, "Failed to shutdown device!\n");
580+
dev_err(rk808->dev, "Failed to shutdown device!\n");
581581

582582
return NOTIFY_DONE;
583583
}
@@ -600,7 +600,7 @@ static int rk808_restart(struct sys_off_data *data)
600600
}
601601
ret = regmap_update_bits(rk808->regmap, reg, bit, bit);
602602
if (ret)
603-
dev_err(&rk808->i2c->dev, "Failed to restart device!\n");
603+
dev_err(rk808->dev, "Failed to restart device!\n");
604604

605605
return NOTIFY_DONE;
606606
}
@@ -720,7 +720,7 @@ static int rk808_probe(struct i2c_client *client)
720720
return -EINVAL;
721721
}
722722

723-
rk808->i2c = client;
723+
rk808->dev = &client->dev;
724724
i2c_set_clientdata(client, rk808);
725725

726726
rk808->regmap = devm_regmap_init_i2c(client, rk808->regmap_cfg);

include/linux/mfd/rk808.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -787,7 +787,7 @@ enum {
787787
};
788788

789789
struct rk808 {
790-
struct i2c_client *i2c;
790+
struct device *dev;
791791
struct regmap_irq_chip_data *irq_data;
792792
struct regmap *regmap;
793793
long variant;

0 commit comments

Comments
 (0)