Browse Source

regulator: palmas: Rename reg_info to palmas_reg_info

reg_info is a generic term which might cause conflict at a later point
in time. To prevent such a thing from occuring in future, rename to
palmas_reg_info.

Signed-off-by: Nishanth Menon <nm@ti.com>
Acked-by: Lee Jones <lee.jones@linaro.org>
Tested-by: Stephen Warren <swarren@nvidia.com>
Tested-by: Keerthy <j-keerthy@ti.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Nishanth Menon 11 years ago
parent
commit
e7cf34ef39
2 changed files with 4 additions and 4 deletions
  1. 2 2
      drivers/regulator/palmas-regulator.c
  2. 2 2
      include/linux/mfd/palmas.h

+ 2 - 2
drivers/regulator/palmas-regulator.c

@@ -41,7 +41,7 @@ static const struct regulator_linear_range smps_high_ranges[] = {
 	REGULATOR_LINEAR_RANGE(3300000, 0x7A, 0x7f, 0),
 };
 
-static struct regs_info palmas_regs_info[] = {
+static struct palmas_regs_info palmas_regs_info[] = {
 	{
 		.name		= "SMPS12",
 		.sname		= "smps1-in",
@@ -227,7 +227,7 @@ static struct regs_info palmas_regs_info[] = {
 	},
 };
 
-static struct regs_info tps65917_regs_info[] = {
+static struct palmas_regs_info tps65917_regs_info[] = {
 	{
 		.name		= "SMPS1",
 		.sname		= "smps1-in",

+ 2 - 2
include/linux/mfd/palmas.h

@@ -102,7 +102,7 @@ struct palmas_sleep_requestor_info {
 	int bit_pos;
 };
 
-struct regs_info {
+struct palmas_regs_info {
 	char	*name;
 	char	*sname;
 	u8	vsel_addr;
@@ -117,7 +117,7 @@ struct palmas_pmic_driver_data {
 	int ldo_begin;
 	int ldo_end;
 	int max_reg;
-	struct regs_info *palmas_regs_info;
+	struct palmas_regs_info *palmas_regs_info;
 	struct of_regulator_match *palmas_matches;
 	struct palmas_sleep_requestor_info *sleep_req_info;
 	int (*smps_register)(struct palmas_pmic *pmic,