]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
regulator: twl: kill unused functions
authorNicolae Rosia <Nicolae_Rosia@mentor.com>
Sat, 12 Nov 2016 12:42:13 +0000 (14:42 +0200)
committerMark Brown <broonie@kernel.org>
Wed, 16 Nov 2016 18:03:55 +0000 (18:03 +0000)
This code was used by OMAP platform based boards
which are now DT only.
Proper support for SMPS is missing in this driver.

Signed-off-by: Nicolae Rosia <Nicolae_Rosia@mentor.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/regulator/twl-regulator.c

index a777c9d0d2df12e8df7a6219a0da1ed41cda968f..3f9f53d98ef0828169be68a0607aed11d0026df7 100644 (file)
@@ -60,13 +60,6 @@ struct twlreg_info {
        /* chip specific features */
        unsigned long           features;
 
-       /*
-        * optional override functions for voltage set/get
-        * these are currently only used for SMPS regulators
-        */
-       int                     (*get_voltage)(void *data);
-       int                     (*set_voltage)(void *data, int target_uV);
-
        /* data passed from board for external get/set voltage */
        void                    *data;
 };
@@ -565,12 +558,7 @@ twl4030smps_set_voltage(struct regulator_dev *rdev, int min_uV, int max_uV,
        struct twlreg_info *info = rdev_get_drvdata(rdev);
        int vsel = DIV_ROUND_UP(min_uV - 600000, 12500);
 
-       if (info->set_voltage) {
-               return info->set_voltage(info->data, min_uV);
-       } else {
-               twlreg_write(info, TWL_MODULE_PM_RECEIVER,
-                       VREG_VOLTAGE_SMPS_4030, vsel);
-       }
+       twlreg_write(info, TWL_MODULE_PM_RECEIVER, VREG_VOLTAGE_SMPS_4030, vsel);
 
        return 0;
 }
@@ -580,9 +568,6 @@ static int twl4030smps_get_voltage(struct regulator_dev *rdev)
        struct twlreg_info *info = rdev_get_drvdata(rdev);
        int vsel;
 
-       if (info->get_voltage)
-               return info->get_voltage(info->data);
-
        vsel = twlreg_read(info, TWL_MODULE_PM_RECEIVER,
                VREG_VOLTAGE_SMPS_4030);
 
@@ -597,21 +582,11 @@ static struct regulator_ops twl4030smps_ops = {
 static int twl6030coresmps_set_voltage(struct regulator_dev *rdev, int min_uV,
        int max_uV, unsigned *selector)
 {
-       struct twlreg_info *info = rdev_get_drvdata(rdev);
-
-       if (info->set_voltage)
-               return info->set_voltage(info->data, min_uV);
-
        return -ENODEV;
 }
 
 static int twl6030coresmps_get_voltage(struct regulator_dev *rdev)
 {
-       struct twlreg_info *info = rdev_get_drvdata(rdev);
-
-       if (info->get_voltage)
-               return info->get_voltage(info->data);
-
        return -ENODEV;
 }
 
@@ -1169,7 +1144,7 @@ MODULE_DEVICE_TABLE(of, twl_of_match);
 
 static int twlreg_probe(struct platform_device *pdev)
 {
-       int                             i, id;
+       int id;
        struct twlreg_info              *info;
        const struct twlreg_info        *template;
        struct regulator_init_data      *initdata;