tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

authored by

Sebastian Reichel and committed by
Lee Jones 04944997 e714b50b

+4 -4
+3 -3
drivers/mfd/rk808.c
··· 577 577 } 578 578 ret = regmap_update_bits(rk808->regmap, reg, bit, bit); 579 579 if (ret) 580 - dev_err(&rk808->i2c->dev, "Failed to shutdown device!\n"); 580 + dev_err(rk808->dev, "Failed to shutdown device!\n"); 581 581 582 582 return NOTIFY_DONE; 583 583 } ··· 600 600 } 601 601 ret = regmap_update_bits(rk808->regmap, reg, bit, bit); 602 602 if (ret) 603 - dev_err(&rk808->i2c->dev, "Failed to restart device!\n"); 603 + dev_err(rk808->dev, "Failed to restart device!\n"); 604 604 605 605 return NOTIFY_DONE; 606 606 } ··· 720 720 return -EINVAL; 721 721 } 722 722 723 - rk808->i2c = client; 723 + rk808->dev = &client->dev; 724 724 i2c_set_clientdata(client, rk808); 725 725 726 726 rk808->regmap = devm_regmap_init_i2c(client, rk808->regmap_cfg);
+1 -1
include/linux/mfd/rk808.h
··· 787 787 }; 788 788 789 789 struct rk808 { 790 - struct i2c_client *i2c; 790 + struct device *dev; 791 791 struct regmap_irq_chip_data *irq_data; 792 792 struct regmap *regmap; 793 793 long variant;