diff options
| author | Biju Das <biju.das.jz@bp.renesas.com> | 2023-09-23 19:49:25 +0200 |
|---|---|---|
| committer | Lee Jones <lee@kernel.org> | 2023-11-01 11:02:12 +0100 |
| commit | 7ec9f1f31d8b41a0725777e220d2eb6e9d0dbc83 (patch) | |
| tree | ad3f0a57353f36ae48e6f2a1c5624841c32acac1 /drivers/mfd/arizona-i2c.c | |
| parent | mfd: iqs62x: Annotate struct iqs62x_fw_blk with __counted_by (diff) | |
| download | linux-7ec9f1f31d8b41a0725777e220d2eb6e9d0dbc83.tar.xz linux-7ec9f1f31d8b41a0725777e220d2eb6e9d0dbc83.zip | |
mfd: arizona-i2c: Simplify obtaining I2C match data
Simplify probe() by replacing device_get_match_data() and ID lookup for
retrieving match data by i2c_get_match_data(). After this drop
intializing the variable type.
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Tested-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20230923174928.56824-2-biju.das.jz@bp.renesas.com
Signed-off-by: Lee Jones <lee@kernel.org>
Diffstat (limited to 'drivers/mfd/arizona-i2c.c')
| -rw-r--r-- | drivers/mfd/arizona-i2c.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/mfd/arizona-i2c.c b/drivers/mfd/arizona-i2c.c index 9b7183ffc928..10e76fc8f12e 100644 --- a/drivers/mfd/arizona-i2c.c +++ b/drivers/mfd/arizona-i2c.c @@ -22,19 +22,12 @@ static int arizona_i2c_probe(struct i2c_client *i2c) { - const struct i2c_device_id *id = i2c_client_get_device_id(i2c); - const void *match_data; struct arizona *arizona; const struct regmap_config *regmap_config = NULL; - unsigned long type = 0; + unsigned long type; int ret; - match_data = device_get_match_data(&i2c->dev); - if (match_data) - type = (unsigned long)match_data; - else if (id) - type = id->driver_data; - + type = (uintptr_t)i2c_get_match_data(i2c); switch (type) { case WM5102: if (IS_ENABLED(CONFIG_MFD_WM5102)) |