aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/regulator/lp872x.c
diff options
context:
space:
mode:
authorKim, Milo <Milo.Kim@ti.com>2012-09-05 00:39:39 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-09-05 19:53:03 -0400
commit5bab305d3c573afc33b241a53452f6736910b2b4 (patch)
tree01060382d4fb8e730e790218f0f4dbc0894a2e38 /drivers/regulator/lp872x.c
parent9d6da6fcc2831220a8754385ee54847e3ee6274f (diff)
regulator: lp872x: remove unnecessary function
The lp872x_check_dvs_validity() is used for checking DVS platform data. If the DVS platform data is not defined, return as error code. Now, this is unnecessary because the default DVS mode is set in this case. Signed-off-by: Milo(Woogyom) Kim <milo.kim@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/regulator/lp872x.c')
-rw-r--r--drivers/regulator/lp872x.c28
1 files changed, 0 insertions, 28 deletions
diff --git a/drivers/regulator/lp872x.c b/drivers/regulator/lp872x.c
index 86485e823f05..708f4b6a17dc 100644
--- a/drivers/regulator/lp872x.c
+++ b/drivers/regulator/lp872x.c
@@ -729,28 +729,6 @@ static struct regulator_desc lp8725_regulator_desc[] = {
729 }, 729 },
730}; 730};
731 731
732static int lp872x_check_dvs_validity(struct lp872x *lp)
733{
734 struct lp872x_dvs *dvs = lp->pdata->dvs;
735 u8 val = 0;
736 int ret;
737
738 ret = lp872x_read_byte(lp, LP872X_GENERAL_CFG, &val);
739 if (ret)
740 return ret;
741
742 ret = 0;
743 if (lp->chipid == LP8720) {
744 if (val & LP8720_EXT_DVS_M)
745 ret = dvs ? 0 : -EINVAL;
746 } else {
747 if ((val & LP8725_DVS1_M) == EXTERN_DVS_USED)
748 ret = dvs ? 0 : -EINVAL;
749 }
750
751 return ret;
752}
753
754static int lp872x_init_dvs(struct lp872x *lp) 732static int lp872x_init_dvs(struct lp872x *lp)
755{ 733{
756 int ret, gpio; 734 int ret, gpio;
@@ -762,12 +740,6 @@ static int lp872x_init_dvs(struct lp872x *lp)
762 if (!dvs) 740 if (!dvs)
763 goto set_default_dvs_mode; 741 goto set_default_dvs_mode;
764 742
765 ret = lp872x_check_dvs_validity(lp);
766 if (ret) {
767 dev_warn(lp->dev, "invalid dvs data: %d\n", ret);
768 return ret;
769 }
770
771 gpio = dvs->gpio; 743 gpio = dvs->gpio;
772 if (!gpio_is_valid(gpio)) { 744 if (!gpio_is_valid(gpio)) {
773 dev_err(lp->dev, "invalid gpio: %d\n", gpio); 745 dev_err(lp->dev, "invalid gpio: %d\n", gpio);