From: Marcelo Schmitt <marcelo.schmitt@xxxxxxxxxx>
Rework ad7091r probe functions so the IIO device is allocated before
the generic device probe function is called.
This change is needed for a follow up patch that passes a pointer to the
IIO device to a couple of regmap callback functions.
Signed-off-by: Marcelo Schmitt <marcelo.schmitt@xxxxxxxxxx>
---
drivers/iio/adc/ad7091r-base.c | 35 +++++++---------------------------
drivers/iio/adc/ad7091r-base.h | 22 +++++++++++++++++----
drivers/iio/adc/ad7091r5.c | 14 ++++++++++++--
3 files changed, 37 insertions(+), 34 deletions(-)
diff --git a/drivers/iio/adc/ad7091r-base.c b/drivers/iio/adc/ad7091r-base.c
index ebf1c8cca25c..69cb5ccdbc49 100644
--- a/drivers/iio/adc/ad7091r-base.c
+++ b/drivers/iio/adc/ad7091r-base.c
@@ -27,21 +27,6 @@
#define AD7091R_REG_CONF_MODE_MASK \
(AD7091R_REG_CONF_AUTO | AD7091R_REG_CONF_CMD)
-enum ad7091r_mode {
- AD7091R_MODE_SAMPLE,
- AD7091R_MODE_COMMAND,
- AD7091R_MODE_AUTOCYCLE,
-};
-
-struct ad7091r_state {
- struct device *dev;
- struct regmap *map;
- struct regulator *vref;
- const struct ad7091r_chip_info *chip_info;
- enum ad7091r_mode mode;
- struct mutex lock; /*lock to prevent concurent reads */
-};
-
static int ad7091r_set_mode(struct ad7091r_state *st, enum ad7091r_mode mode)
{
int ret, conf;
@@ -200,20 +185,14 @@ static void ad7091r_remove(void *data)
regulator_disable(st->vref);
}
-int ad7091r_probe(struct device *dev, const char *name,
- const struct ad7091r_chip_info *chip_info,
- struct regmap *map, int irq)
+int ad7091r_probe(struct iio_dev *iio_dev, const char *name,
+ const struct ad7091r_chip_info *chip_info,
+ struct regmap *map, int irq)
{
- struct iio_dev *iio_dev;
struct ad7091r_state *st;
int ret;
- iio_dev = devm_iio_device_alloc(dev, sizeof(*st));
- if (!iio_dev)
- return -ENOMEM;
-
st = iio_priv(iio_dev);
- st->dev = dev;
st->chip_info = chip_info;
st->map = map;
@@ -231,7 +210,7 @@ int ad7091r_probe(struct device *dev, const char *name,
return ret;
dev_set_drvdata(st->dev, iio_dev);
- ret = devm_request_threaded_irq(dev, irq, NULL,
+ ret = devm_request_threaded_irq(st->dev, irq, NULL,
ad7091r_event_handler,
IRQF_TRIGGER_FALLING |
IRQF_ONESHOT, name, st);
@@ -239,7 +218,7 @@ int ad7091r_probe(struct device *dev, const char *name,
return ret;
}
- st->vref = devm_regulator_get_optional(dev, "vref");
+ st->vref = devm_regulator_get_optional(st->dev, "vref");
if (IS_ERR(st->vref)) {
if (PTR_ERR(st->vref) == -EPROBE_DEFER)
return -EPROBE_DEFER;
@@ -248,7 +227,7 @@ int ad7091r_probe(struct device *dev, const char *name,
ret = regulator_enable(st->vref);
if (ret)
return ret;
- ret = devm_add_action_or_reset(dev, ad7091r_remove, st);
+ ret = devm_add_action_or_reset(st->dev, ad7091r_remove, st);
if (ret)
return ret;
}
@@ -258,7 +237,7 @@ int ad7091r_probe(struct device *dev, const char *name,
if (ret)
return ret;
- return devm_iio_device_register(dev, iio_dev);
+ return devm_iio_device_register(st->dev, iio_dev);
}
EXPORT_SYMBOL_NS_GPL(ad7091r_probe, IIO_AD7091R);
diff --git a/drivers/iio/adc/ad7091r-base.h b/drivers/iio/adc/ad7091r-base.h
index 2efed8ddc59a..405939f4eee0 100644
--- a/drivers/iio/adc/ad7091r-base.h
+++ b/drivers/iio/adc/ad7091r-base.h
@@ -30,7 +30,21 @@
}
struct device;
-struct ad7091r_state;
+
+enum ad7091r_mode {
+ AD7091R_MODE_SAMPLE,
+ AD7091R_MODE_COMMAND,
+ AD7091R_MODE_AUTOCYCLE,
+};
+
+struct ad7091r_state {
+ struct device *dev;
+ struct regmap *map;
+ struct regulator *vref;
+ const struct ad7091r_chip_info *chip_info;
+ enum ad7091r_mode mode;
+ struct mutex lock; /*lock to prevent concurent reads */
+};
struct ad7091r_chip_info {
unsigned int num_channels;
@@ -60,9 +74,9 @@ static const struct iio_event_spec ad7091r_events[] = {
extern const struct regmap_config ad7091r_regmap_config;
-int ad7091r_probe(struct device *dev, const char *name,
- const struct ad7091r_chip_info *chip_info,
- struct regmap *map, int irq);
+int ad7091r_probe(struct iio_dev *iio_dev, const char *name,
+ const struct ad7091r_chip_info *chip_info,
+ struct regmap *map, int irq);
bool ad7091r_volatile_reg(struct device *dev, unsigned int reg);
diff --git a/drivers/iio/adc/ad7091r5.c b/drivers/iio/adc/ad7091r5.c
index 9d3ccfca94ec..1a27841d1bbc 100644
--- a/drivers/iio/adc/ad7091r5.c
+++ b/drivers/iio/adc/ad7091r5.c
@@ -42,8 +42,18 @@ static int ad7091r5_i2c_probe(struct i2c_client *i2c)
{
const struct i2c_device_id *id = i2c_client_get_device_id(i2c);
const struct ad7091r_chip_info *chip_info;
- struct regmap *map = devm_regmap_init_i2c(i2c, &ad7091r_regmap_config);
+ struct ad7091r_state *st;
+ struct iio_dev *iio_dev;
+ struct regmap *map;
+ iio_dev = devm_iio_device_alloc(&i2c->dev, sizeof(*st));
+ if (!iio_dev)
+ return -ENOMEM;
+
+ st = iio_priv(iio_dev);
+ st->dev = &i2c->dev;
+
+ map = devm_regmap_init_i2c(i2c, &ad7091r_regmap_config);
if (IS_ERR(map))
return PTR_ERR(map);
@@ -52,7 +62,7 @@ static int ad7091r5_i2c_probe(struct i2c_client *i2c)
else
chip_info = &ad7091r5_chip_info_noirq;
- return ad7091r_probe(&i2c->dev, id->name, chip_info, map, i2c->irq);
+ return ad7091r_probe(iio_dev, id->name, chip_info, map, i2c->irq);
}
static const struct of_device_id ad7091r5_dt_ids[] = {
--
2.42.0
