aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/iio/adc
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2013-03-25 04:58:00 -0400
committerJonathan Cameron <jic23@kernel.org>2013-03-25 17:06:09 -0400
commit1e9663c62b32f695af37fec4afc473b59f5ca9b4 (patch)
tree8f1c1c9fbaa89c3f75ad14a04dd8ee20ecb6dba0 /drivers/iio/adc
parentc5cf4606b6659e711258b6e567415ab83a3b646c (diff)
iio:trigger: Introduce iio_tigger_{set,get}_drvdata
Introduce iio_tigger_{set,get}_drvdata which allows to attach driver specific data to a trigger. The functions wrap access to the triggers private_data field and all current users are updated to use iio_tigger_{set,get}_drvdata instead of directly accessing the private_data field. This is the first step towards removing the private_data field from the iio_trigger struct. The following coccinelle script has been used to update the drivers: <smpl> @@ struct iio_trigger *trigger; expression priv; @@ -trigger->private_data = priv +iio_trigger_set_drv_data(trigger, priv) @@ struct iio_trigger *trigger; @@ -trigger->private_data +iio_trigger_get_drv_data(trigger) </smpl> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers/iio/adc')
-rw-r--r--drivers/iio/adc/ad_sigma_delta.c2
-rw-r--r--drivers/iio/adc/at91_adc.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/iio/adc/ad_sigma_delta.c b/drivers/iio/adc/ad_sigma_delta.c
index afe6d78c8ff0..f0d6335ae087 100644
--- a/drivers/iio/adc/ad_sigma_delta.c
+++ b/drivers/iio/adc/ad_sigma_delta.c
@@ -470,7 +470,7 @@ static int ad_sd_probe_trigger(struct iio_dev *indio_dev)
470 disable_irq_nosync(sigma_delta->spi->irq); 470 disable_irq_nosync(sigma_delta->spi->irq);
471 } 471 }
472 sigma_delta->trig->dev.parent = &sigma_delta->spi->dev; 472 sigma_delta->trig->dev.parent = &sigma_delta->spi->dev;
473 sigma_delta->trig->private_data = sigma_delta; 473 iio_trigger_set_drvdata(sigma_delta->trig, sigma_delta);
474 474
475 ret = iio_trigger_register(sigma_delta->trig); 475 ret = iio_trigger_register(sigma_delta->trig);
476 if (ret) 476 if (ret)
diff --git a/drivers/iio/adc/at91_adc.c b/drivers/iio/adc/at91_adc.c
index 92eb6a5b9e72..6fc43c15f028 100644
--- a/drivers/iio/adc/at91_adc.c
+++ b/drivers/iio/adc/at91_adc.c
@@ -188,7 +188,7 @@ static u8 at91_adc_get_trigger_value_by_name(struct iio_dev *idev,
188 188
189static int at91_adc_configure_trigger(struct iio_trigger *trig, bool state) 189static int at91_adc_configure_trigger(struct iio_trigger *trig, bool state)
190{ 190{
191 struct iio_dev *idev = trig->private_data; 191 struct iio_dev *idev = iio_trigger_get_drvdata(trig);
192 struct at91_adc_state *st = iio_priv(idev); 192 struct at91_adc_state *st = iio_priv(idev);
193 struct iio_buffer *buffer = idev->buffer; 193 struct iio_buffer *buffer = idev->buffer;
194 struct at91_adc_reg_desc *reg = st->registers; 194 struct at91_adc_reg_desc *reg = st->registers;
@@ -254,7 +254,7 @@ static struct iio_trigger *at91_adc_allocate_trigger(struct iio_dev *idev,
254 return NULL; 254 return NULL;
255 255
256 trig->dev.parent = idev->dev.parent; 256 trig->dev.parent = idev->dev.parent;
257 trig->private_data = idev; 257 iio_trigger_set_drvdata(trig, idev);
258 trig->ops = &at91_adc_trigger_ops; 258 trig->ops = &at91_adc_trigger_ops;
259 259
260 ret = iio_trigger_register(trig); 260 ret = iio_trigger_register(trig);