aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJonathan Cameron <jic23@kernel.org>2011-12-14 15:49:31 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2011-12-16 13:56:26 -0500
commitc0fdbe149c9d1cab9057c39a10cd609751541cf2 (patch)
treeb89ea65fba70885ee2a98ba3de0272221fe22796 /drivers
parent8324e860770b1defa73d8f52244211bb9f0ed2f8 (diff)
staging:iio: iio_trigger contains defunct owner field. Remove it.
This field moved into the trigger_ops structure a while back, but somehow never quite got cleared up. This clears the last few drivers to set it (nothing uses it) and gets rid of it entirely. Signed-off-by: Jonathan Cameron <jic23@kernel.org> Acked-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/iio/adc/ad7192.c1
-rw-r--r--drivers/staging/iio/adc/ad7793.c1
-rw-r--r--drivers/staging/iio/trigger.h2
-rw-r--r--drivers/staging/iio/trigger/iio-trig-periodic-rtc.c1
4 files changed, 0 insertions, 5 deletions
diff --git a/drivers/staging/iio/adc/ad7192.c b/drivers/staging/iio/adc/ad7192.c
index 6114601ec478..dfeb4ba85c53 100644
--- a/drivers/staging/iio/adc/ad7192.c
+++ b/drivers/staging/iio/adc/ad7192.c
@@ -637,7 +637,6 @@ static int ad7192_probe_trigger(struct iio_dev *indio_dev)
637 disable_irq_nosync(st->spi->irq); 637 disable_irq_nosync(st->spi->irq);
638 st->irq_dis = true; 638 st->irq_dis = true;
639 st->trig->dev.parent = &st->spi->dev; 639 st->trig->dev.parent = &st->spi->dev;
640 st->trig->owner = THIS_MODULE;
641 st->trig->private_data = indio_dev; 640 st->trig->private_data = indio_dev;
642 641
643 ret = iio_trigger_register(st->trig); 642 ret = iio_trigger_register(st->trig);
diff --git a/drivers/staging/iio/adc/ad7793.c b/drivers/staging/iio/adc/ad7793.c
index 6e03bfbacd34..accf3258bcde 100644
--- a/drivers/staging/iio/adc/ad7793.c
+++ b/drivers/staging/iio/adc/ad7793.c
@@ -504,7 +504,6 @@ static int ad7793_probe_trigger(struct iio_dev *indio_dev)
504 disable_irq_nosync(st->spi->irq); 504 disable_irq_nosync(st->spi->irq);
505 st->irq_dis = true; 505 st->irq_dis = true;
506 st->trig->dev.parent = &st->spi->dev; 506 st->trig->dev.parent = &st->spi->dev;
507 st->trig->owner = THIS_MODULE;
508 st->trig->private_data = indio_dev; 507 st->trig->private_data = indio_dev;
509 508
510 ret = iio_trigger_register(st->trig); 509 ret = iio_trigger_register(st->trig);
diff --git a/drivers/staging/iio/trigger.h b/drivers/staging/iio/trigger.h
index 5cc42a655c88..1cfca231db8f 100644
--- a/drivers/staging/iio/trigger.h
+++ b/drivers/staging/iio/trigger.h
@@ -46,7 +46,6 @@ struct iio_trigger_ops {
46 * @private_data: [DRIVER] device specific data 46 * @private_data: [DRIVER] device specific data
47 * @list: [INTERN] used in maintenance of global trigger list 47 * @list: [INTERN] used in maintenance of global trigger list
48 * @alloc_list: [DRIVER] used for driver specific trigger list 48 * @alloc_list: [DRIVER] used for driver specific trigger list
49 * @owner: [DRIVER] used to monitor usage count of the trigger.
50 * @use_count: use count for the trigger 49 * @use_count: use count for the trigger
51 * @subirq_chip: [INTERN] associate 'virtual' irq chip. 50 * @subirq_chip: [INTERN] associate 'virtual' irq chip.
52 * @subirq_base: [INTERN] base number for irqs provided by trigger. 51 * @subirq_base: [INTERN] base number for irqs provided by trigger.
@@ -63,7 +62,6 @@ struct iio_trigger {
63 void *private_data; 62 void *private_data;
64 struct list_head list; 63 struct list_head list;
65 struct list_head alloc_list; 64 struct list_head alloc_list;
66 struct module *owner;
67 int use_count; 65 int use_count;
68 66
69 struct irq_chip subirq_chip; 67 struct irq_chip subirq_chip;
diff --git a/drivers/staging/iio/trigger/iio-trig-periodic-rtc.c b/drivers/staging/iio/trigger/iio-trig-periodic-rtc.c
index d35d085da949..bd7416b2c561 100644
--- a/drivers/staging/iio/trigger/iio-trig-periodic-rtc.c
+++ b/drivers/staging/iio/trigger/iio-trig-periodic-rtc.c
@@ -125,7 +125,6 @@ static int iio_trig_periodic_rtc_probe(struct platform_device *dev)
125 goto error_put_trigger_and_remove_from_list; 125 goto error_put_trigger_and_remove_from_list;
126 } 126 }
127 trig->private_data = trig_info; 127 trig->private_data = trig_info;
128 trig->owner = THIS_MODULE;
129 trig->ops = &iio_prtc_trigger_ops; 128 trig->ops = &iio_prtc_trigger_ops;
130 /* RTC access */ 129 /* RTC access */
131 trig_info->rtc 130 trig_info->rtc