Unverified Commit 907af7d6 authored by Manivannan Sadhasivam's avatar Manivannan Sadhasivam Committed by Mark Brown
Browse files

regulator: Move OF_ API declarations/definitions outside CONFIG_REGULATOR 



Since these are hidden inside CONFIG_REGULATOR, building the consumer
drivers without CONFIG_REGULATOR will result in the following build error:

>> drivers/pci/pwrctrl/slot.c:39:15: error: implicit declaration of
function 'of_regulator_bulk_get_all'; did you mean 'regulator_bulk_get'?
[-Werror=implicit-function-declaration]
      39 |         ret = of_regulator_bulk_get_all(dev, dev_of_node(dev),
         |               ^~~~~~~~~~~~~~~~~~~~~~~~~
         |               regulator_bulk_get
   cc1: some warnings being treated as errors

This also removes the duplicated definitions that were possibly added to
fix the build issues.

Reported-by: default avatarkernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202501020407.HmQQQKa0-lkp@intel.com/


Fixes: 27b9ecc7 ("regulator: Add of_regulator_bulk_get_all")
Signed-off-by: default avatarManivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Link: https://patch.msgid.link/20250104115058.19216-3-manivannan.sadhasivam@linaro.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 1156b5e8

include/linux/regulator/consumer.h

+32 −46
Original line number Diff line number Diff line
@@ -168,38 +168,6 @@ int devm_regulator_get_enable_read_voltage(struct device *dev, const char *id); 
void regulator_put(struct regulator *regulator);

void devm_regulator_put(struct regulator *regulator);



#if IS_ENABLED(CONFIG_OF)

struct regulator *__must_check of_regulator_get_optional(struct device *dev,

							 struct device_node *node,

							 const char *id);

struct regulator *__must_check devm_of_regulator_get_optional(struct device *dev,

							      struct device_node *node,

							      const char *id);

int __must_check of_regulator_bulk_get_all(struct device *dev, struct device_node *np,

					   struct regulator_bulk_data **consumers);

#else

static inline struct regulator *__must_check of_regulator_get_optional(struct device *dev,

								       struct device_node *node,

								       const char *id)

{

	return ERR_PTR(-ENODEV);

}



static inline struct regulator *__must_check devm_of_regulator_get_optional(struct device *dev,

									    struct device_node *node,

									    const char *id)

{

	return ERR_PTR(-ENODEV);

}



static inline int of_regulator_bulk_get_all(struct device *dev, struct device_node *np,

					    struct regulator_bulk_data **consumers)

{

	return 0;

}



#endif



int regulator_register_supply_alias(struct device *dev, const char *id,

				    struct device *alias_dev,

				    const char *alias_id);
@@ -380,20 +348,6 @@ devm_regulator_get_optional(struct device *dev, const char *id) 
	return ERR_PTR(-ENODEV);

}



static inline struct regulator *__must_check of_regulator_get_optional(struct device *dev,

								       struct device_node *node,

								       const char *id)

{

	return ERR_PTR(-ENODEV);

}



static inline struct regulator *__must_check devm_of_regulator_get_optional(struct device *dev,

									    struct device_node *node,

									    const char *id)

{

	return ERR_PTR(-ENODEV);

}



static inline void regulator_put(struct regulator *regulator)

{

}
@@ -701,6 +655,38 @@ regulator_is_equal(struct regulator *reg1, struct regulator *reg2) 
}

#endif



#if IS_ENABLED(CONFIG_OF) && IS_ENABLED(CONFIG_REGULATOR)

struct regulator *__must_check of_regulator_get_optional(struct device *dev,

							 struct device_node *node,

							 const char *id);

struct regulator *__must_check devm_of_regulator_get_optional(struct device *dev,

							      struct device_node *node,

							      const char *id);

int __must_check of_regulator_bulk_get_all(struct device *dev, struct device_node *np,

					   struct regulator_bulk_data **consumers);

#else

static inline struct regulator *__must_check of_regulator_get_optional(struct device *dev,

								       struct device_node *node,

								       const char *id)

{

	return ERR_PTR(-ENODEV);

}



static inline struct regulator *__must_check devm_of_regulator_get_optional(struct device *dev,

									    struct device_node *node,

									    const char *id)

{

	return ERR_PTR(-ENODEV);

}



static inline int of_regulator_bulk_get_all(struct device *dev, struct device_node *np,

					    struct regulator_bulk_data **consumers)

{

	return 0;

}



#endif



static inline int regulator_set_voltage_triplet(struct regulator *regulator,

						int min_uV, int target_uV,

						int max_uV)