regulator: lp872x: Remove lp872x_dvs_state

After this driver was converted to gpiod, clang started warning:

vers/regulator/lp872x.c:689:57: error: implicit conversion from
enumeration type 'enum lp872x_dvs_state' to different enumeration type
'enum gpiod_flags' [-Werror,-Wenum-conversion]
        dvs->gpio = devm_gpiod_get_optional(lp->dev, "ti,dvs", pinstate);
                    ~~~~~~~~~~~~~~~~~~~~~~~                    ^~~~~~~~
1 error generated.

lp872x_dvs_state was updated to have values from gpiod_flags but this is
not enough to avoid an implicit conversion warning from either GCC or
clang (although GCC enables this warning under -Wextra instead of -Wall
like clang so it is not seen under normal builds).

Eliminate lp872x_dvs_state in favor of using gpiod_flags everywhere so
that there is no more warning about an implicit conversion.

Fixes: 72bf80cf09c4 ("regulator: lp872x: replacing legacy gpio interface for gpiod")
Link: https://github.com/ClangBuiltLinux/linux/issues/1481
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Link: https://lore.kernel.org/r/20211019004335.193492-1-nathan@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/regulator/lp872x.c b/drivers/regulator/lp872x.c
index 1dba5dbcd461906b81fe9ec89f2fd5623e6cbf97..35d826fe9def11eb12008581dbe6331ee9a68896 100644 (file)
--- a/drivers/regulator/lp872x.c
+++ b/drivers/regulator/lp872x.c
@@ -103,7 +103,7 @@ struct lp872x {
        enum lp872x_id chipid;
        struct lp872x_platform_data *pdata;
        int num_regulators;
-       enum lp872x_dvs_state dvs_pin;
+       enum gpiod_flags dvs_pin;
 };
 
 /* LP8720/LP8725 shared voltage table for LDOs */
@@ -251,9 +251,9 @@ static int lp872x_regulator_enable_time(struct regulator_dev *rdev)
 static void lp872x_set_dvs(struct lp872x *lp, enum lp872x_dvs_sel dvs_sel,
                        struct gpio_desc *gpio)
 {
-       enum lp872x_dvs_state state;
+       enum gpiod_flags state;
 
-       state = dvs_sel == SEL_V1 ? DVS_HIGH : DVS_LOW;
+       state = dvs_sel == SEL_V1 ? GPIOD_OUT_HIGH : GPIOD_OUT_LOW;
        gpiod_set_value(gpio, state);
        lp->dvs_pin = state;
 }
@@ -269,7 +269,7 @@ static u8 lp872x_select_buck_vout_addr(struct lp872x *lp,
        switch (buck) {
        case LP8720_ID_BUCK:
                if (val & LP8720_EXT_DVS_M) {
-                       addr = (lp->dvs_pin == DVS_HIGH) ?
+                       addr = (lp->dvs_pin == GPIOD_OUT_HIGH) ?
                                LP8720_BUCK_VOUT1 : LP8720_BUCK_VOUT2;
                } else {
                        if (lp872x_read_byte(lp, LP8720_ENABLE, &val))
@@ -283,7 +283,7 @@ static u8 lp872x_select_buck_vout_addr(struct lp872x *lp,
                if (val & LP8725_DVS1_M)
                        addr = LP8725_BUCK1_VOUT1;
                else
-                       addr = (lp->dvs_pin == DVS_HIGH) ?
+                       addr = (lp->dvs_pin == GPIOD_OUT_HIGH) ?
                                LP8725_BUCK1_VOUT1 : LP8725_BUCK1_VOUT2;
                break;
        case LP8725_ID_BUCK2:
@@ -675,7 +675,7 @@ static const struct regulator_desc lp8725_regulator_desc[] = {
 static int lp872x_init_dvs(struct lp872x *lp)
 {
        struct lp872x_dvs *dvs = lp->pdata ? lp->pdata->dvs : NULL;
-       enum lp872x_dvs_state pinstate;
+       enum gpiod_flags pinstate;
        u8 mask[] = { LP8720_EXT_DVS_M, LP8725_DVS1_M | LP8725_DVS2_M };
        u8 default_dvs_mode[] = { LP8720_DEFAULT_DVS, LP8725_DEFAULT_DVS };
 
@@ -841,7 +841,7 @@ static struct lp872x_platform_data
 
        of_property_read_u8(np, "ti,dvs-vsel", (u8 *)&pdata->dvs->vsel);
        of_property_read_u8(np, "ti,dvs-state", &dvs_state);
-       pdata->dvs->init_state = dvs_state ? DVS_HIGH : DVS_LOW;
+       pdata->dvs->init_state = dvs_state ? GPIOD_OUT_HIGH : GPIOD_OUT_LOW;
 
        if (of_get_child_count(np) == 0)
                goto out;

diff --git a/include/linux/regulator/lp872x.h b/include/linux/regulator/lp872x.h
index 8e7e0343c6e16bf4986f6123468ee36bf0334053..b62e45aa1dd360fbe50027b7de321052acf91cae 100644 (file)
--- a/include/linux/regulator/lp872x.h
+++ b/include/linux/regulator/lp872x.h
@@ -40,11 +40,6 @@ enum lp872x_regulator_id {
        LP872X_ID_MAX,
 };
 
-enum lp872x_dvs_state {
-       DVS_LOW  = GPIOD_OUT_LOW,
-       DVS_HIGH = GPIOD_OUT_HIGH,
-};
-
 enum lp872x_dvs_sel {
        SEL_V1,
        SEL_V2,
@@ -59,7 +54,7 @@ enum lp872x_dvs_sel {
 struct lp872x_dvs {
        struct gpio_desc *gpio;
        enum lp872x_dvs_sel vsel;
-       enum lp872x_dvs_state init_state;
+       enum gpiod_flags init_state;
 };
 
 /**