Unverified Commit 9705c49c authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "regulator: devres: remove unused device-managed unregister APIs"... 

Merge series "regulator: devres: remove unused device-managed unregister APIs" from Alexandru Ardelean <aardelean@deviqon.com>:

These APIs aren't used anywhere and most-likely exist because of the
general principle of C APIs, where if an API function does an
allocation/registration, it must also have an equivalent
deallocation/deregistration counterpart.

For devm_ functions this isn't all that true (for all cases), as the idea
of these function is to provide an auto-cleanup logic on drivers/system
de-init.

Removing these discourages any weird logic that could be created with
such an API functions.

Alexandru Ardelean (4):
  regulator: devres: remove devm_regulator_unregister_notifier()
    function
  regulator: devres: remove devm_regulator_unregister() function
  regulator: devres: remove
    devm_regulator_bulk_unregister_supply_alias()
  regulator: devres: unexport devm_regulator_unregister_supply_alias()

 drivers/regulator/devres.c         | 105 +----------------------------
 include/linux/regulator/consumer.h |  23 -------
 include/linux/regulator/driver.h   |   1 -
 3 files changed, 2 insertions(+), 127 deletions(-)

--
2.31.1
parents 2c8dad1e 4d9f4d1d

drivers/regulator/devres.c

+2 −67
Original line number Diff line number Diff line
@@ -205,35 +205,6 @@ struct regulator_dev *devm_regulator_register(struct device *dev, 
}

EXPORT_SYMBOL_GPL(devm_regulator_register);



static int devm_rdev_match(struct device *dev, void *res, void *data)

{

	struct regulator_dev **r = res;

	if (!r || !*r) {

		WARN_ON(!r || !*r);

		return 0;

	}

	return *r == data;

}



/**

 * devm_regulator_unregister - Resource managed regulator_unregister()

 * @dev:  device to supply

 * @rdev: regulator to free

 *

 * Unregister a regulator registered with devm_regulator_register().

 * 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(struct device *dev, struct regulator_dev *rdev)

{

	int rc;



	rc = devres_release(dev, devm_rdev_release, devm_rdev_match, rdev);

	if (rc != 0)

		WARN_ON(rc);

}

EXPORT_SYMBOL_GPL(devm_regulator_unregister);



struct regulator_supply_alias_match {

	struct device *dev;

	const char *id;
@@ -296,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;
@@ -321,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
@@ -373,30 +332,6 @@ int devm_regulator_bulk_register_supply_alias(struct device *dev, 
}

EXPORT_SYMBOL_GPL(devm_regulator_bulk_register_supply_alias);



/**

 * devm_regulator_bulk_unregister_supply_alias - Managed unregister

 * multiple aliases

 *

 * @dev:    device to supply

 * @id:     list of supply names or regulator IDs

 * @num_id: number of aliases to unregister

 *

 * Unregister aliases registered with

 * devm_regulator_bulk_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_bulk_unregister_supply_alias(struct device *dev,

						 const char *const *id,

						 int num_id)

{

	int i;



	for (i = 0; i < num_id; ++i)

		devm_regulator_unregister_supply_alias(dev, id[i]);

}

EXPORT_SYMBOL_GPL(devm_regulator_bulk_unregister_supply_alias);



struct regulator_notifier_match {

	struct regulator *regulator;

	struct notifier_block *nb;

include/linux/regulator/consumer.h

+0 −15
Original line number Diff line number Diff line
@@ -222,17 +222,12 @@ 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,

					      struct device *alias_dev,

					      const char *const *alias_id,

					      int num_id);

void devm_regulator_bulk_unregister_supply_alias(struct device *dev,

						 const char *const *id,

						 int num_id);



/* regulator output control and status */

int __must_check regulator_enable(struct regulator *regulator);
@@ -408,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,
@@ -422,11 +412,6 @@ static inline int devm_regulator_bulk_register_supply_alias(struct device *dev, 
	return 0;

}



static inline void devm_regulator_bulk_unregister_supply_alias(

	struct device *dev, const char *const *id, int num_id)

{

}



static inline int regulator_enable(struct regulator *regulator)

{

	return 0;

include/linux/regulator/driver.h

+0 −1
Original line number Diff line number Diff line
@@ -645,7 +645,6 @@ devm_regulator_register(struct device *dev, 
			const struct regulator_desc *regulator_desc,

			const struct regulator_config *config);

void regulator_unregister(struct regulator_dev *rdev);

void devm_regulator_unregister(struct device *dev, struct regulator_dev *rdev);



int regulator_notifier_call_chain(struct regulator_dev *rdev,

				  unsigned long event, void *data);