summaryrefslogtreecommitdiffstats
path: root/drivers/regulator/mp5416.c
diff options
context:
space:
mode:
authorBiju Das <biju.das.jz@bp.renesas.com>2023-09-03 18:03:01 +0200
committerMark Brown <broonie@kernel.org>2023-09-11 02:31:27 +0200
commit969b033a77a8fa59a5fe9320b371eadd4f4321a6 (patch)
tree43907d85f67b8a5b3131c041f069fc4b60b39e9a /drivers/regulator/mp5416.c
parentregulator: max20086: Make similar OF and ID table (diff)
downloadlinux-969b033a77a8fa59a5fe9320b371eadd4f4321a6.tar.xz
linux-969b033a77a8fa59a5fe9320b371eadd4f4321a6.zip
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>
Diffstat (limited to 'drivers/regulator/mp5416.c')
-rw-r--r--drivers/regulator/mp5416.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/regulator/mp5416.c b/drivers/regulator/mp5416.c
index d068ac93d373..3457e650a994 100644
--- a/drivers/regulator/mp5416.c
+++ b/drivers/regulator/mp5416.c
@@ -200,7 +200,7 @@ static int mp5416_i2c_probe(struct i2c_client *client)
return PTR_ERR(regmap);
}
- desc = of_device_get_match_data(dev);
+ desc = i2c_get_match_data(client);
if (!desc)
return -ENODEV;
@@ -223,14 +223,14 @@ static int mp5416_i2c_probe(struct i2c_client *client)
static const struct of_device_id mp5416_of_match[] = {
{ .compatible = "mps,mp5416", .data = &mp5416_regulators_desc },
{ .compatible = "mps,mp5496", .data = &mp5496_regulators_desc },
- {},
+ {}
};
MODULE_DEVICE_TABLE(of, mp5416_of_match);
static const struct i2c_device_id mp5416_id[] = {
- { "mp5416", },
- { "mp5496", },
- { },
+ { "mp5416", (kernel_ulong_t)&mp5416_regulators_desc },
+ { "mp5496", (kernel_ulong_t)&mp5496_regulators_desc },
+ {}
};
MODULE_DEVICE_TABLE(i2c, mp5416_id);