Commit 14a6ee6e authored by Alexandru Ardelean's avatar Alexandru Ardelean Committed by Jonathan Cameron
Browse files

iio: dac: ad5064: convert probe to full device-managed 



This change converts the probe of the AD5064 driver to use only
device-managed functions.

The regulator_bulk_disable() is passed on a devm_add_action_or_reset() hook
and the devm_iio_device_register() can be used to register the IIO device.

The driver has both I2C and SPI hooks inside, so all these can be removed.

Signed-off-by: default avatarAlexandru Ardelean <aardelean@deviqon.com>
Link: https://lore.kernel.org/r/20210913115237.301310-1-aardelean@deviqon.com


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

drivers/iio/dac/ad5064.c

+12 −37
Original line number Diff line number Diff line
@@ -843,6 +843,13 @@ static int ad5064_request_vref(struct ad5064_state *st, struct device *dev) 
	return ret;

}



static void ad5064_bulk_reg_disable(void *data)

{

	struct ad5064_state *st = data;



	regulator_bulk_disable(ad5064_num_vref(st), st->vref_reg);

}



static int ad5064_probe(struct device *dev, enum ad5064_type type,

			const char *name, ad5064_write_func write)

{
@@ -858,7 +865,6 @@ static int ad5064_probe(struct device *dev, enum ad5064_type type, 


	st = iio_priv(indio_dev);

	mutex_init(&st->lock);

	dev_set_drvdata(dev, indio_dev);



	st->chip_info = &ad5064_chip_info_tbl[type];

	st->dev = dev;
@@ -872,6 +878,10 @@ static int ad5064_probe(struct device *dev, enum ad5064_type type, 
		ret = regulator_bulk_enable(ad5064_num_vref(st), st->vref_reg);

		if (ret)

			return ret;



		ret = devm_add_action_or_reset(dev, ad5064_bulk_reg_disable, st);

		if (ret)

			return ret;

	}



	indio_dev->name = name;
@@ -887,30 +897,7 @@ static int ad5064_probe(struct device *dev, enum ad5064_type type, 
		st->dac_cache[i] = midscale;

	}



	ret = iio_device_register(indio_dev);

	if (ret)

		goto error_disable_reg;



	return 0;



error_disable_reg:

	if (!st->use_internal_vref)

		regulator_bulk_disable(ad5064_num_vref(st), st->vref_reg);



	return ret;

}



static int ad5064_remove(struct device *dev)

{

	struct iio_dev *indio_dev = dev_get_drvdata(dev);

	struct ad5064_state *st = iio_priv(indio_dev);



	iio_device_unregister(indio_dev);



	if (!st->use_internal_vref)

		regulator_bulk_disable(ad5064_num_vref(st), st->vref_reg);



	return 0;

	return devm_iio_device_register(dev, indio_dev);

}



#if IS_ENABLED(CONFIG_SPI_MASTER)
@@ -932,11 +919,6 @@ static int ad5064_spi_probe(struct spi_device *spi) 
				ad5064_spi_write);

}



static int ad5064_spi_remove(struct spi_device *spi)

{

	return ad5064_remove(&spi->dev);

}



static const struct spi_device_id ad5064_spi_ids[] = {

	{"ad5024", ID_AD5024},

	{"ad5025", ID_AD5025},
@@ -963,7 +945,6 @@ static struct spi_driver ad5064_spi_driver = { 
		   .name = "ad5064",

	},

	.probe = ad5064_spi_probe,

	.remove = ad5064_spi_remove,

	.id_table = ad5064_spi_ids,

};
@@ -1019,11 +1000,6 @@ static int ad5064_i2c_probe(struct i2c_client *i2c, 
						ad5064_i2c_write);

}



static int ad5064_i2c_remove(struct i2c_client *i2c)

{

	return ad5064_remove(&i2c->dev);

}



static const struct i2c_device_id ad5064_i2c_ids[] = {

	{"ad5625", ID_AD5625 },

	{"ad5625r-1v25", ID_AD5625R_1V25 },
@@ -1081,7 +1057,6 @@ static struct i2c_driver ad5064_i2c_driver = { 
		   .name = "ad5064",

	},

	.probe = ad5064_i2c_probe,

	.remove = ad5064_i2c_remove,

	.id_table = ad5064_i2c_ids,

};