regulator: mp5416: Make similar OF and ID table

Make similar OF and ID table to extend support for ID match using
i2c_match_data(). Currently it works only for OF match tables as the
driver_data is wrong for ID match.

While at it, remove trailing comma in the terminator entry for OF/ID
table and drop a space from terminator entry for ID table.

Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Link: https://lore.kernel.org/r/20230903160301.79111-1-biju.das.jz@bp.renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Biju Das 2023-09-03 17:03:01 +01:00 committed by Mark Brown
parent 9d9cd8e6a4
commit 969b033a77
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0

View File

@ -200,7 +200,7 @@ static int mp5416_i2c_probe(struct i2c_client *client)
return PTR_ERR(regmap); return PTR_ERR(regmap);
} }
desc = of_device_get_match_data(dev); desc = i2c_get_match_data(client);
if (!desc) if (!desc)
return -ENODEV; return -ENODEV;
@ -223,14 +223,14 @@ static int mp5416_i2c_probe(struct i2c_client *client)
static const struct of_device_id mp5416_of_match[] = { static const struct of_device_id mp5416_of_match[] = {
{ .compatible = "mps,mp5416", .data = &mp5416_regulators_desc }, { .compatible = "mps,mp5416", .data = &mp5416_regulators_desc },
{ .compatible = "mps,mp5496", .data = &mp5496_regulators_desc }, { .compatible = "mps,mp5496", .data = &mp5496_regulators_desc },
{}, {}
}; };
MODULE_DEVICE_TABLE(of, mp5416_of_match); MODULE_DEVICE_TABLE(of, mp5416_of_match);
static const struct i2c_device_id mp5416_id[] = { static const struct i2c_device_id mp5416_id[] = {
{ "mp5416", }, { "mp5416", (kernel_ulong_t)&mp5416_regulators_desc },
{ "mp5496", }, { "mp5496", (kernel_ulong_t)&mp5496_regulators_desc },
{ }, {}
}; };
MODULE_DEVICE_TABLE(i2c, mp5416_id); MODULE_DEVICE_TABLE(i2c, mp5416_id);