2015-07-21 15:59 GMT+09:00 Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>:
> The gpiod functions include variants for managed gpiod resources. Use it
> to simplify the remove function.
>
> As the driver handles a device node without a specification of dvs gpios
> just fine, additionally use the variant of gpiod_get exactly for this
> use case. This makes error checking more strict.
>
> As a third benefit this patch makes the driver use the flags parameter
> of gpiod_get* which will not be optional any more after 4.2 and so
> prevents a build failure when the respective gpiod commit is merged.
>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
> ---
> Hello,
>
> this is the more complete fix of the issue that Stephen found while creating
> next-20150721 (see commit f51ec04cf8be9f7ef795f1f39ada17c19f725650).
>
> Best regards
> Uwe
>
> drivers/regulator/rk808-regulator.c | 25 +++++++++++--------------
> 1 file changed, 11 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/regulator/rk808-regulator.c b/drivers/regulator/rk808-regulator.c
> index ca913fd15598..3738e49beb75 100644
> --- a/drivers/regulator/rk808-regulator.c
> +++ b/drivers/regulator/rk808-regulator.c
> @@ -94,7 +94,7 @@ static int rk808_buck1_2_get_voltage_sel_regmap(struct regulator_dev *rdev)
> unsigned int val;
> int ret;
>
> - if (IS_ERR(gpio) || gpiod_get_value(gpio) == 0)
> + if (!gpio || gpiod_get_value(gpio) == 0)
> return regulator_get_voltage_sel_regmap(rdev);
>
> ret = regmap_read(rdev->regmap,
> @@ -168,7 +168,7 @@ static int rk808_buck1_2_set_voltage_sel(struct regulator_dev *rdev,
> unsigned old_sel;
> int ret, gpio_level;
>
> - if (IS_ERR(gpio))
> + if (!gpio)
> return rk808_buck1_2_i2c_set_voltage_sel(rdev, sel);
>
> gpio_level = gpiod_get_value(gpio);
> @@ -205,7 +205,7 @@ static int rk808_buck1_2_set_voltage_time_sel(struct regulator_dev *rdev,
> struct gpio_desc *gpio = pdata->dvs_gpio[id];
>
> /* if there is no dvs1/2 pin, we don't need wait extra time here. */
> - if (IS_ERR(gpio))
> + if (!gpio)
> return 0;
>
> return regulator_set_voltage_time_sel(rdev, old_selector, new_selector);
> @@ -540,14 +540,19 @@ static int rk808_regulator_dt_parse_pdata(struct device *dev,
> goto dt_parse_end;
>
> for (i = 0; i < ARRAY_SIZE(pdata->dvs_gpio); i++) {
> - pdata->dvs_gpio[i] = gpiod_get_index(client_dev, "dvs", i);
> + pdata->dvs_gpio[i] =
> + devm_gpiod_get_index_optional(client_dev, "dvs", i,
> + GPIOD_OUT_LOW);
> if (IS_ERR(pdata->dvs_gpio[i])) {
> + dev_err(dev, "failed to get dvs%d gpio\n", i);
Missing of_node_put() from of_get_child_by_name() called before.
> + return PTR_ERR(pdata->dvs_gpio[i]);
> + }
> +
> + if (!pdata->dvs_gpio[i]) {
> dev_warn(dev, "there is no dvs%d gpio\n", i);
> continue;
> }
>
> - gpiod_direction_output(pdata->dvs_gpio[i], 0);
> -
> tmp = i ? RK808_DVS2_POL : RK808_DVS1_POL;
> ret = regmap_update_bits(map, RK808_IO_POL_REG, tmp,
> gpiod_is_active_low(pdata->dvs_gpio[i]) ?
> @@ -561,14 +566,6 @@ dt_parse_end:
>
> static int rk808_regulator_remove(struct platform_device *pdev)
> {
> - struct rk808_regulator_data *pdata = platform_get_drvdata(pdev);
> - int i;
> -
> - for (i = 0; i < ARRAY_SIZE(pdata->dvs_gpio); i++) {
> - if (!IS_ERR(pdata->dvs_gpio[i]))
> - gpiod_put(pdata->dvs_gpio[i]);
> - }
> -
> return 0;
> }
The function looks empty so it can be removed entirely.
Best regards,
Krzysztof
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
