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>

diff --git a/drivers/regulator/palmas-regulator.c b/drivers/regulator/palmas-regulator.c
index 91f60fa91d4b4a649ffb14879f5b573dd1e668b9..05f11b96e17f6d4358230834ae2a3bcecdd20faa 100644 (file)
--- a/drivers/regulator/palmas-regulator.c
+++ b/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",

diff --git a/include/linux/mfd/palmas.h b/include/linux/mfd/palmas.h
index 1a045ba32c13ff8083537bebbe2ec53d22e18b18..fb0390a1a498f29df135bbe7500c1dfcc00a27d7 100644 (file)
--- a/include/linux/mfd/palmas.h
+++ b/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,