Unverified Commit 4d9f4d1d authored by Alexandru Ardelean's avatar Alexandru Ardelean Committed by Mark Brown
Browse files

regulator: devres: unexport devm_regulator_unregister_supply_alias() 



This API hook isn't used anywhere outside of the regulator devres code.
This function is needed for the devm_regulator_bulk_register_supply_alias()
function on the error path, to cleanup any previously registered supply
aliases.

This change makes the devm_regulator_unregister_supply_alias() local to the
regulator core framework, to avoid it being used in any weird logic.
It's also removing the doc-string for
devm_regulator_unregister_supply_alias(), since it doesn't need to be
documented anymore, as no other external consumer should use it.

Signed-off-by: default avatarAlexandru Ardelean <aardelean@deviqon.com>
Link: https://lore.kernel.org/r/20210625122324.327585-5-aardelean@deviqon.com


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

drivers/regulator/devres.c

+2 −14
Original line number Diff line number Diff line
@@ -267,19 +267,8 @@ int devm_regulator_register_supply_alias(struct device *dev, const char *id, 
}

EXPORT_SYMBOL_GPL(devm_regulator_register_supply_alias);



/**

 * devm_regulator_unregister_supply_alias - Resource managed

 * regulator_unregister_supply_alias()

 *

 * @dev: device to supply

 * @id:  supply name or regulator ID

 *

 * Unregister an alias registered with

 * devm_regulator_register_supply_alias(). Normally this function

 * will not need to be called and the resource management code

 * will ensure that the resource is freed.

 */

void devm_regulator_unregister_supply_alias(struct device *dev, const char *id)

static void devm_regulator_unregister_supply_alias(struct device *dev,

						   const char *id)

{

	struct regulator_supply_alias_match match;

	int rc;
@@ -292,7 +281,6 @@ void devm_regulator_unregister_supply_alias(struct device *dev, const char *id) 
	if (rc != 0)

		WARN_ON(rc);

}

EXPORT_SYMBOL_GPL(devm_regulator_unregister_supply_alias);



/**

 * devm_regulator_bulk_register_supply_alias - Managed register

include/linux/regulator/consumer.h

+0 −7
Original line number Diff line number Diff line
@@ -222,8 +222,6 @@ void regulator_bulk_unregister_supply_alias(struct device *dev, 
int devm_regulator_register_supply_alias(struct device *dev, const char *id,

					 struct device *alias_dev,

					 const char *alias_id);

void devm_regulator_unregister_supply_alias(struct device *dev,

					    const char *id);



int devm_regulator_bulk_register_supply_alias(struct device *dev,

					      const char *const *id,
@@ -405,11 +403,6 @@ static inline int devm_regulator_register_supply_alias(struct device *dev, 
	return 0;

}



static inline void devm_regulator_unregister_supply_alias(struct device *dev,

							  const char *id)

{

}



static inline int devm_regulator_bulk_register_supply_alias(struct device *dev,

						const char *const *id,

						struct device *alias_dev,