Commit c1ae3a4e authored by Hans de Goede's avatar Hans de Goede Committed by Sebastian Reichel
Browse files

power: supply: bq25890: Use the devm_regmap_field_bulk_alloc() helper 



Use the devm_regmap_field_bulk_alloc() helper function instead of
open-coding this ourselves.

Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
parent 48f45b09

drivers/power/supply/bq25890_charger.c

+4 −10
Original line number Diff line number Diff line
@@ -1165,7 +1165,6 @@ static int bq25890_probe(struct i2c_client *client, 
	struct device *dev = &client->dev;

	struct bq25890_device *bq;

	int ret;

	int i;



	bq = devm_kzalloc(dev, sizeof(*bq), GFP_KERNEL);

	if (!bq)
@@ -1182,15 +1181,10 @@ static int bq25890_probe(struct i2c_client *client, 
		return dev_err_probe(dev, PTR_ERR(bq->rmap),

				     "failed to allocate register map\n");



	for (i = 0; i < ARRAY_SIZE(bq25890_reg_fields); i++) {

		const struct reg_field *reg_fields = bq25890_reg_fields;



		bq->rmap_fields[i] = devm_regmap_field_alloc(dev, bq->rmap,

							     reg_fields[i]);

		if (IS_ERR(bq->rmap_fields[i]))

			return dev_err_probe(dev, PTR_ERR(bq->rmap_fields[i]),

					     "cannot allocate regmap field\n");

	}

	ret = devm_regmap_field_bulk_alloc(dev, bq->rmap, bq->rmap_fields,

					   bq25890_reg_fields, F_MAX_FIELDS);

	if (ret)

		return ret;



	i2c_set_clientdata(client, bq);