Hi,
On Wed, Feb 12, 2025 at 06:46:23PM +0200, Andy Shevchenko wrote:
> Get matching data in one step by switching to use i2c_get_match_data().
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
> ---
Acked-by: Sebastian Reichel <sebastian.reichel@xxxxxxxxxxxxx>
-- Sebastian
> drivers/power/supply/ip5xxx_power.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/power/supply/ip5xxx_power.c b/drivers/power/supply/ip5xxx_power.c
> index c448e0ac0dfa..717ec86c769b 100644
> --- a/drivers/power/supply/ip5xxx_power.c
> +++ b/drivers/power/supply/ip5xxx_power.c
> @@ -828,7 +828,7 @@ static void ip5xxx_setup_regs(struct device *dev, struct ip5xxx *ip5xxx,
>
> static int ip5xxx_power_probe(struct i2c_client *client)
> {
> - const struct ip5xxx_regfield_config *fields = &ip51xx_fields;
> + const struct ip5xxx_regfield_config *fields;
> struct power_supply_config psy_cfg = {};
> struct device *dev = &client->dev;
> const struct of_device_id *of_id;
> @@ -843,9 +843,7 @@ static int ip5xxx_power_probe(struct i2c_client *client)
> if (IS_ERR(ip5xxx->regmap))
> return PTR_ERR(ip5xxx->regmap);
>
> - of_id = i2c_of_match_device(dev->driver->of_match_table, client);
> - if (of_id)
> - fields = (const struct ip5xxx_regfield_config *)of_id->data;
> + fields = i2c_get_match_data(client) ?: &ip51xx_fields;
> ip5xxx_setup_regs(dev, ip5xxx, fields);
>
> psy_cfg.of_node = dev->of_node;
> --
> 2.45.1.3035.g276e886db78b
>
Attachment:
signature.asc
Description: PGP signature
