Skip to content

Commit

Permalink
regulator: lp872x: remove unnecessary function
Browse files Browse the repository at this point in the history
 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>
  • Loading branch information
Kim, Milo authored and Mark Brown committed Sep 5, 2012
1 parent 9d6da6f commit 5bab305
Showing 1 changed file with 0 additions and 28 deletions.
28 changes: 0 additions & 28 deletions drivers/regulator/lp872x.c
Original file line number Diff line number Diff line change
Expand Up @@ -729,28 +729,6 @@ static struct regulator_desc lp8725_regulator_desc[] = {
},
};

static int lp872x_check_dvs_validity(struct lp872x *lp)
{
struct lp872x_dvs *dvs = lp->pdata->dvs;
u8 val = 0;
int ret;

ret = lp872x_read_byte(lp, LP872X_GENERAL_CFG, &val);
if (ret)
return ret;

ret = 0;
if (lp->chipid == LP8720) {
if (val & LP8720_EXT_DVS_M)
ret = dvs ? 0 : -EINVAL;
} else {
if ((val & LP8725_DVS1_M) == EXTERN_DVS_USED)
ret = dvs ? 0 : -EINVAL;
}

return ret;
}

static int lp872x_init_dvs(struct lp872x *lp)
{
int ret, gpio;
Expand All @@ -762,12 +740,6 @@ static int lp872x_init_dvs(struct lp872x *lp)
if (!dvs)
goto set_default_dvs_mode;

ret = lp872x_check_dvs_validity(lp);
if (ret) {
dev_warn(lp->dev, "invalid dvs data: %d\n", ret);
return ret;
}

gpio = dvs->gpio;
if (!gpio_is_valid(gpio)) {
dev_err(lp->dev, "invalid gpio: %d\n", gpio);
Expand Down

0 comments on commit 5bab305

Please sign in to comment.