regulator: anatop: remove unneeded name field of struct anatop_regulator
authorDong Aisheng <aisheng.dong@nxp.com>
Wed, 12 Apr 2017 01:58:45 +0000 (09:58 +0800)
committerMark Brown <broonie@kernel.org>
Tue, 11 Apr 2017 20:36:01 +0000 (21:36 +0100)
sreg->name is only used as an intermediate assign of rdesc->name, plus
another strcmp. Since we already have rdesc->name, no need it anymore.

Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/regulator/anatop-regulator.c

index 58141cbdf257a23ea2f1048395b599878ac03c60..c6ce9745ffc8dd18de8368fd547f31c6a5c31aab 100644 (file)
@@ -39,7 +39,6 @@
 #define LDO_FET_FULL_ON                        0x1f
 
 struct anatop_regulator {
-       const char *name;
        u32 control_reg;
        struct regmap *anatop;
        int vol_bit_shift;
@@ -194,12 +193,12 @@ static int anatop_regulator_probe(struct platform_device *pdev)
        if (!sreg)
                return -ENOMEM;
 
-       of_property_read_string(np, "regulator-name", &sreg->name);
        rdesc = &sreg->rdesc;
-       rdesc->name = sreg->name;
        rdesc->type = REGULATOR_VOLTAGE;
        rdesc->owner = THIS_MODULE;
 
+       of_property_read_string(np, "regulator-name", &rdesc->name);
+
        initdata = of_get_regulator_init_data(dev, np, rdesc);
        if (!initdata)
                return -ENOMEM;
@@ -297,7 +296,7 @@ static int anatop_regulator_probe(struct platform_device *pdev)
                 * a sane default until imx6-cpufreq was probed and changes the
                 * voltage to the correct value. In this case we set 1.25V.
                 */
-               if (!sreg->sel && !strcmp(sreg->name, "vddpu"))
+               if (!sreg->sel && !strcmp(rdesc->name, "vddpu"))
                        sreg->sel = 22;
 
                if (!sreg->bypass && !sreg->sel) {