Skip to content

Commit

Permalink
regulator: core: Add destroy_regulator()
Browse files Browse the repository at this point in the history
Part of the regulator_get() code is already factored out into
create_regulator(). This patch factors out some of the regulator_put()
code into destroy_regulator() so that create_regulator() has a
corresponding unwind function. Subsequent patches will use this
function.

Signed-off-by: Saravana Kannan <saravanak@google.com>
Link: https://lore.kernel.org/r/20200716042053.1927676-3-saravanak@google.com
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Saravana Kannan authored and Mark Brown committed Jul 20, 2020
1 parent a98bcaa commit e1794aa
Showing 1 changed file with 21 additions and 13 deletions.
34 changes: 21 additions & 13 deletions drivers/regulator/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ static int regulator_balance_voltage(struct regulator_dev *rdev,
static struct regulator *create_regulator(struct regulator_dev *rdev,
struct device *dev,
const char *supply_name);
static void destroy_regulator(struct regulator *regulator);
static void _regulator_put(struct regulator *regulator);

const char *rdev_get_name(struct regulator_dev *rdev)
Expand Down Expand Up @@ -2034,20 +2035,9 @@ struct regulator *regulator_get_optional(struct device *dev, const char *id)
}
EXPORT_SYMBOL_GPL(regulator_get_optional);

/* regulator_list_mutex lock held by regulator_put() */
static void _regulator_put(struct regulator *regulator)
static void destroy_regulator(struct regulator *regulator)
{
struct regulator_dev *rdev;

if (IS_ERR_OR_NULL(regulator))
return;

lockdep_assert_held_once(&regulator_list_mutex);

/* Docs say you must disable before calling regulator_put() */
WARN_ON(regulator->enable_count);

rdev = regulator->rdev;
struct regulator_dev *rdev = regulator->rdev;

debugfs_remove_recursive(regulator->debugfs);

Expand All @@ -2068,6 +2058,24 @@ static void _regulator_put(struct regulator *regulator)

kfree_const(regulator->supply_name);
kfree(regulator);
}

/* regulator_list_mutex lock held by regulator_put() */
static void _regulator_put(struct regulator *regulator)
{
struct regulator_dev *rdev;

if (IS_ERR_OR_NULL(regulator))
return;

lockdep_assert_held_once(&regulator_list_mutex);

/* Docs say you must disable before calling regulator_put() */
WARN_ON(regulator->enable_count);

rdev = regulator->rdev;

destroy_regulator(regulator);

module_put(rdev->owner);
put_device(&rdev->dev);
Expand Down

0 comments on commit e1794aa

Please sign in to comment.