diff options
| author | Jerome Brunet <jbrunet@baylibre.com> | 2024-10-08 19:07:03 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2024-10-22 22:49:15 +0300 |
| commit | 602ff58ae4fe4289b0ca71cba9fb82f7de92cd64 (patch) | |
| tree | 5d65d2de416047e0432f858cbbda891fb652095d | |
| parent | cfcdf395c21eeac4543d2b8fef9d29ae9e4559e9 (diff) | |
| download | linux-602ff58ae4fe4289b0ca71cba9fb82f7de92cd64.tar.xz | |
regulator: core: remove machine init callback from config
The machine specific regulator_init() appears to be unused.
It does not allow a lot of interaction with the regulator framework,
since nothing from the framework is passed along (desc, config,
etc ...)
Machine specific init may also be done with the added init_cb() in
the regulator description, so remove regulator_init().
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Link: https://patch.msgid.link/20241008-regulator-ignored-data-v2-3-d1251e0ee507@baylibre.com
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | drivers/regulator/core.c | 7 | ||||
| -rw-r--r-- | include/linux/regulator/machine.h | 3 |
2 files changed, 1 insertions, 9 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index eecb05a0d08c..f8e36c9f5943 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -5775,13 +5775,6 @@ regulator_register(struct device *dev, resolved_early = true; } - /* perform any regulator specific init */ - if (init_data && init_data->regulator_init) { - ret = init_data->regulator_init(rdev->reg_data); - if (ret < 0) - goto wash; - } - if (config->ena_gpiod) { ret = regulator_ena_gpio_request(rdev, config); if (ret != 0) { diff --git a/include/linux/regulator/machine.h b/include/linux/regulator/machine.h index 0cd76d264727..d0d700ff337a 100644 --- a/include/linux/regulator/machine.h +++ b/include/linux/regulator/machine.h @@ -285,8 +285,7 @@ struct regulator_init_data { int num_consumer_supplies; struct regulator_consumer_supply *consumer_supplies; - /* optional regulator machine specific init */ - int (*regulator_init)(void *driver_data); + /* optional regulator machine specific data */ void *driver_data; /* core does not touch this */ }; |