diff options
| author | Biju Das <biju.das.jz@bp.renesas.com> | 2023-09-03 17:48:31 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-09-11 01:30:09 +0100 |
| commit | c187b8f87d553cc124c568ecc010a8bf73cf745f (patch) | |
| tree | 17c31403d6d30d276223c34d3bb5848ce54440f7 /drivers/regulator | |
| parent | 0bb80ecc33a8fb5a682236443c1e740d5c917d1d (diff) | |
| download | linux-c187b8f87d553cc124c568ecc010a8bf73cf745f.tar.gz | |
regulator: pv880x0: Drop ifdeffery
Drop of_match_ptr() from pv88080_regulator_driver and get rid of ugly
CONFIG_OF ifdeffery. This slightly increases the size of pv88080_dt_ids
on non-OF system and shouldn't be an issue.
Add mod_devicetable.h include.
While at it, remove trailing comma in the terminator entry for OF/ID
table.
Suggested-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Link: https://lore.kernel.org/r/20230903164832.83077-2-biju.das.jz@bp.renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/pv88080-regulator.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/regulator/pv88080-regulator.c b/drivers/regulator/pv88080-regulator.c index 7ab3e4a9bd28c..1b2a8385e2e82 100644 --- a/drivers/regulator/pv88080-regulator.c +++ b/drivers/regulator/pv88080-regulator.c @@ -5,6 +5,7 @@ #include <linux/err.h> #include <linux/i2c.h> +#include <linux/mod_devicetable.h> #include <linux/module.h> #include <linux/of.h> #include <linux/init.h> @@ -196,15 +197,13 @@ static const struct pv88080_compatible_regmap pv88080_ba_regs = { .hvbuck_vsel_mask = PV88080_VHVBUCK_MASK, }; -#ifdef CONFIG_OF static const struct of_device_id pv88080_dt_ids[] = { { .compatible = "pvs,pv88080", .data = (void *)TYPE_PV88080_AA }, { .compatible = "pvs,pv88080-aa", .data = (void *)TYPE_PV88080_AA }, { .compatible = "pvs,pv88080-ba", .data = (void *)TYPE_PV88080_BA }, - {}, + {} }; MODULE_DEVICE_TABLE(of, pv88080_dt_ids); -#endif static unsigned int pv88080_buck_get_mode(struct regulator_dev *rdev) { @@ -550,7 +549,7 @@ static const struct i2c_device_id pv88080_i2c_id[] = { { "pv88080", TYPE_PV88080_AA }, { "pv88080-aa", TYPE_PV88080_AA }, { "pv88080-ba", TYPE_PV88080_BA }, - {}, + {} }; MODULE_DEVICE_TABLE(i2c, pv88080_i2c_id); @@ -558,7 +557,7 @@ static struct i2c_driver pv88080_regulator_driver = { .driver = { .name = "pv88080", .probe_type = PROBE_PREFER_ASYNCHRONOUS, - .of_match_table = of_match_ptr(pv88080_dt_ids), + .of_match_table = pv88080_dt_ids, }, .probe = pv88080_i2c_probe, .id_table = pv88080_i2c_id, |