History

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

Mark Brown committed 6 years ago

Commit ebe0bdf2 parents 9909f79 0468e662 files · +21 −0Browse files

Unified · Split

2 files
  1. drivers/regulator/helpers.c +14 −0
  2. include/linux/regulator/consumer.h +7 −0
drivers/regulator/helpers.c+14−0
@@ -13,6 +13,8 @@ · 12 unmodified lines
1313 #include <linux/regulator/driver.h>
1414 #include <linux/module.h>
1515
16+#include "internal.h"
17+
1618 /**
1719 * regulator_is_enabled_regmap - standard is_enabled() for regmap users
1820 *
@@ -881,3 +883,15 @@ void regulator_bulk_set_supply_names(struct regulator_bulk_data *consumers, · 862 unmodified lines
881883 consumers[i].supply = supply_names[i];
882884 }
883885 EXPORT_SYMBOL_GPL(regulator_bulk_set_supply_names);
886+
887+/**
888+ * regulator_is_equal - test whether two regulators are the same
889+ *
890+ * @reg1: first regulator to operate on
891+ * @reg2: second regulator to operate on
892+ */
893+bool regulator_is_equal(struct regulator *reg1, struct regulator *reg2)
894+{
895+ return reg1->rdev == reg2->rdev;
896+}
897+EXPORT_SYMBOL_GPL(regulator_is_equal);
include/linux/regulator/consumer.h+7−0
@@ -287,6 +287,8 @@ void regulator_bulk_set_supply_names(struct regulator_bulk_data *consumers, · 286 unmodified lines
287287 const char *const *supply_names,
288288 unsigned int num_supplies);
289289
290+bool regulator_is_equal(struct regulator *reg1, struct regulator *reg2);
291+
290292 #else
291293
292294 /*
@@ -593,6 +595,11 @@ regulator_bulk_set_supply_names(struct regulator_bulk_data *consumers, · 300 unmodified lines
593595 {
594596 }
595597
598+static inline bool
599+regulator_is_equal(struct regulator *reg1, struct regulator *reg2)
600+{
601+ return false;
602+}
596603 #endif
597604
598605 static inline int regulator_set_voltage_triplet(struct regulator *regulator,