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>

diff --git a/drivers/regulator/mp5416.c b/drivers/regulator/mp5416.c
index d068ac93d37309ef7e65aff7fa03a28dcd3d056c..3457e650a99459dac177cb506653eae4fc0e6413 100644 (file)
--- 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);