From: "Dr. David Alan Gilbert" <linux@xxxxxxxxxxx> regulator_get_init_drvdata() was added in 2008 by the commit a5766f11cfd3 ("regulator: core - Rework machine API to remove string based functions.") regulator_set_drvdata() was also added in 2008 by the commit 414c70cb91c4 ("regulator: regulator framework core") neither have been used since, Remove them. Signed-off-by: Dr. David Alan Gilbert <linux@xxxxxxxxxxx> --- drivers/regulator/core.c | 17 ----------------- include/linux/regulator/consumer.h | 6 ------ include/linux/regulator/driver.h | 1 - 3 files changed, 24 deletions(-) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 32e3919e37d2..60c72d77f77a 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -6096,17 +6096,6 @@ void *regulator_get_drvdata(struct regulator *regulator) } EXPORT_SYMBOL_GPL(regulator_get_drvdata); -/** - * regulator_set_drvdata - set regulator driver data - * @regulator: regulator - * @data: data - */ -void regulator_set_drvdata(struct regulator *regulator, void *data) -{ - regulator->rdev->reg_data = data; -} -EXPORT_SYMBOL_GPL(regulator_set_drvdata); - /** * rdev_get_id - get regulator ID * @rdev: regulator @@ -6131,12 +6120,6 @@ struct regmap *rdev_get_regmap(struct regulator_dev *rdev) } EXPORT_SYMBOL_GPL(rdev_get_regmap); -void *regulator_get_init_drvdata(struct regulator_init_data *reg_init_data) -{ - return reg_init_data->driver_data; -} -EXPORT_SYMBOL_GPL(regulator_get_init_drvdata); - #ifdef CONFIG_DEBUG_FS static int supply_map_show(struct seq_file *sf, void *data) { diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h index 999eba865c20..0e9275079e17 100644 --- a/include/linux/regulator/consumer.h +++ b/include/linux/regulator/consumer.h @@ -267,7 +267,6 @@ int regulator_set_suspend_voltage(struct regulator *regulator, int min_uV, /* driver data - core doesn't touch */ void *regulator_get_drvdata(struct regulator *regulator); -void regulator_set_drvdata(struct regulator *regulator, void *data); /* misc helpers */ @@ -633,11 +632,6 @@ static inline void *regulator_get_drvdata(struct regulator *regulator) return NULL; } -static inline void regulator_set_drvdata(struct regulator *regulator, - void *data) -{ -} - static inline int regulator_count_voltages(struct regulator *regulator) { return 0; diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h index 4a216fdba354..e849bab379f2 100644 --- a/include/linux/regulator/driver.h +++ b/include/linux/regulator/driver.h @@ -765,7 +765,6 @@ int regulator_set_active_discharge_regmap(struct regulator_dev *rdev, int regulator_set_current_limit_regmap(struct regulator_dev *rdev, int min_uA, int max_uA); int regulator_get_current_limit_regmap(struct regulator_dev *rdev); -void *regulator_get_init_drvdata(struct regulator_init_data *reg_init_data); int regulator_find_closest_bigger(unsigned int target, const unsigned int *table, unsigned int num_sel, unsigned int *sel); int regulator_set_ramp_delay_regmap(struct regulator_dev *rdev, int ramp_delay); -- 2.49.0