Commit 2c620883 authored by Matti Vaittinen's avatar Matti Vaittinen Committed by Jonathan Cameron
Browse files

iio: gyro: bmg160_core: Simplify using devm_regulator_*get_enable() 



Use devm_regulator_bulk_get_enable() instead of open coded bulk-get,
bulk-enable, add-action-to-disable-at-detach - pattern.

Signed-off-by: default avatarMatti Vaittinen <mazziesaccount@gmail.com>
Link: https://lore.kernel.org/r/3fd11489356b1c73a3d7b4bd9dec7e12c9fe8788.1660934107.git.mazziesaccount@gmail.com


Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 08f75f18

drivers/iio/gyro/bmg160_core.c

+3 −21
Original line number Diff line number Diff line
@@ -93,7 +93,6 @@ 


struct bmg160_data {

	struct regmap *regmap;

	struct regulator_bulk_data regulators[2];

	struct iio_trigger *dready_trig;

	struct iio_trigger *motion_trig;

	struct iio_mount_matrix orientation;
@@ -1067,16 +1066,10 @@ static const char *bmg160_match_acpi_device(struct device *dev) 
	return dev_name(dev);

}



static void bmg160_disable_regulators(void *d)

{

	struct bmg160_data *data = d;



	regulator_bulk_disable(ARRAY_SIZE(data->regulators), data->regulators);

}



int bmg160_core_probe(struct device *dev, struct regmap *regmap, int irq,

		      const char *name)

{

	static const char * const regulators[] = { "vdd", "vddio" };

	struct bmg160_data *data;

	struct iio_dev *indio_dev;

	int ret;
@@ -1090,22 +1083,11 @@ int bmg160_core_probe(struct device *dev, struct regmap *regmap, int irq, 
	data->irq = irq;

	data->regmap = regmap;



	data->regulators[0].supply = "vdd";

	data->regulators[1].supply = "vddio";

	ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(data->regulators),

				      data->regulators);

	ret = devm_regulator_bulk_get_enable(dev, ARRAY_SIZE(regulators),

					     regulators);

	if (ret)

		return dev_err_probe(dev, ret, "Failed to get regulators\n");



	ret = regulator_bulk_enable(ARRAY_SIZE(data->regulators),

				    data->regulators);

	if (ret)

		return ret;



	ret = devm_add_action_or_reset(dev, bmg160_disable_regulators, data);

	if (ret)

		return ret;



	ret = iio_read_mount_matrix(dev, &data->orientation);

	if (ret)

		return ret;