Commit ebe0bdf9 authored by Mark Brown's avatar Mark Brown

Merge remote-tracking branch 'regulator/topic/equal' into regulator-next

parents 9909f798 0468e667
...@@ -13,6 +13,8 @@ ...@@ -13,6 +13,8 @@
#include <linux/regulator/driver.h> #include <linux/regulator/driver.h>
#include <linux/module.h> #include <linux/module.h>
#include "internal.h"
/** /**
* regulator_is_enabled_regmap - standard is_enabled() for regmap users * regulator_is_enabled_regmap - standard is_enabled() for regmap users
* *
...@@ -881,3 +883,15 @@ void regulator_bulk_set_supply_names(struct regulator_bulk_data *consumers, ...@@ -881,3 +883,15 @@ void regulator_bulk_set_supply_names(struct regulator_bulk_data *consumers,
consumers[i].supply = supply_names[i]; consumers[i].supply = supply_names[i];
} }
EXPORT_SYMBOL_GPL(regulator_bulk_set_supply_names); EXPORT_SYMBOL_GPL(regulator_bulk_set_supply_names);
/**
* regulator_is_equal - test whether two regulators are the same
*
* @reg1: first regulator to operate on
* @reg2: second regulator to operate on
*/
bool regulator_is_equal(struct regulator *reg1, struct regulator *reg2)
{
return reg1->rdev == reg2->rdev;
}
EXPORT_SYMBOL_GPL(regulator_is_equal);
...@@ -287,6 +287,8 @@ void regulator_bulk_set_supply_names(struct regulator_bulk_data *consumers, ...@@ -287,6 +287,8 @@ void regulator_bulk_set_supply_names(struct regulator_bulk_data *consumers,
const char *const *supply_names, const char *const *supply_names,
unsigned int num_supplies); unsigned int num_supplies);
bool regulator_is_equal(struct regulator *reg1, struct regulator *reg2);
#else #else
/* /*
...@@ -593,6 +595,11 @@ regulator_bulk_set_supply_names(struct regulator_bulk_data *consumers, ...@@ -593,6 +595,11 @@ regulator_bulk_set_supply_names(struct regulator_bulk_data *consumers,
{ {
} }
static inline bool
regulator_is_equal(struct regulator *reg1, struct regulator *reg2)
{
return false;
}
#endif #endif
static inline int regulator_set_voltage_triplet(struct regulator *regulator, static inline int regulator_set_voltage_triplet(struct regulator *regulator,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment