regulator: ab8500-ext: Remove unnecessary checking for ab9540 and ab8540
authorAxel Lin <axel.lin@ingics.com>
Sun, 7 Apr 2013 15:15:24 +0000 (23:15 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 8 Apr 2013 10:23:49 +0000 (11:23 +0100)
This code was added by commit 0fe17e20a6
"regulator: ab8500-ext: Add support for AB9540 regulators"
and commit bd44e2cb "regulator: ab8500: Also check for AB8505 based platforms"

The original patch[1] is to set info->desc.ops = &ab9540_ext_regulator_ops.

However, ab9540_ext_regulator_ops is identical to ab8500_ext_regulator_ops[2].
Thus we can complete remove the unnecessary checking for ab9540 and ab8540.

[1] https://lkml.org/lkml/2013/3/28/333
[2] https://lkml.org/lkml/2013/4/1/178

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
drivers/regulator/ab8500-ext.c

index 5e604a2ad7cdf1958de1721580898bf103c5d09b..c7896af4aaa8087dc4c8dd245ced182ffac0c8d7 100644 (file)
@@ -389,15 +389,8 @@ int ab8500_ext_regulator_init(struct platform_device *pdev)
                config.init_data = &pdata->ext_regulator[i];
                config.driver_data = info;
 
-               if ((is_ab9540(ab8500) || is_ab8540(ab8500)) &&
-                   ((info->desc.id == AB8500_EXT_SUPPLY1) ||
-                    (info->desc.id == AB8500_EXT_SUPPLY2) ||
-                    (info->desc.id == AB8500_EXT_SUPPLY3)))
-                       info->desc.ops = &ab8500_ext_regulator_ops;
-
                /* register regulator with framework */
                info->rdev = regulator_register(&info->desc, &config);
-
                if (IS_ERR(info->rdev)) {
                        err = PTR_ERR(info->rdev);
                        dev_err(&pdev->dev, "failed to register regulator %s\n",