On 05/09/16 10:14, Crt Mori wrote:
> This patch is inspired by a comment of Jonathan Cameron on patch of
> Linus Walleij commit aeb55fff3891834e07a3144159a7298a19696af8 ("iio: st_sensors: fetch and enable regulators unconditionally").
>
> The explanation for this change is same as in that patch:
> "Supplies are *not* optional (optional means that the supply is
> optional in the electrical sense, not the software sense) so we need to
> get the and enable them at all times.
>
> If the device tree or board file does not define suitable regulators for
> the component, it will be substituted by a dummy regulator, or, if
> regulators are disabled altogether, by stubs. There is no need to use the
> IS_ERR_OR_NULL() check that is considered harmful.
>
> Reported-by: Linus Wallerij <linus.walleij@xxxxxxxxxx>
> Suggested-by: Jonathan Cameron <jic23@xxxxxxxxxx>
> Signed-off-by: Crt Mori <cmo@xxxxxxxxxxx>
Applied to the togreg branch of iio.git. Initially pushed out as testing
for the autobuilders to do their magic.
Thanks,
Jonathan
> ---
> drivers/iio/pressure/ms5611_core.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/iio/pressure/ms5611_core.c b/drivers/iio/pressure/ms5611_core.c
> index feb41f8..a74ed1f 100644
> --- a/drivers/iio/pressure/ms5611_core.c
> +++ b/drivers/iio/pressure/ms5611_core.c
> @@ -416,8 +416,7 @@ static int ms5611_init(struct iio_dev *indio_dev)
> return 0;
>
> err_regulator_disable:
> - if (!IS_ERR_OR_NULL(st->vdd))
> - regulator_disable(st->vdd);
> + regulator_disable(st->vdd);
> return ret;
> }
>
> @@ -425,8 +424,7 @@ static void ms5611_fini(const struct iio_dev *indio_dev)
> {
> const struct ms5611_state *st = iio_priv(indio_dev);
>
> - if (!IS_ERR_OR_NULL(st->vdd))
> - regulator_disable(st->vdd);
> + regulator_disable(st->vdd);
> }
>
> int ms5611_probe(struct iio_dev *indio_dev, struct device *dev,
>
--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
