staging:iio: trigger owner field confusion cleanup.
Subsystems (4)
Jonathan Cameron
maintainercover staging:iio: trigger owner field confusion cleanup.
Hi Greg,
Lifting from original posting...
This issue came to my attention whilst reviewing Maximes at91 patches. Anyhow, we have iio_trigger->owner and iio_trigger->ops->owner.
The first was meant to have gone away.
A couple of drivers don't provide iio_trigger->ops causing nastiness to happen when the trigger get or put occurs. Not seen in the wild as I don't have either of the two devices in question.
Simple fix. Add the struture where missing and get rid of the owner field from the iio_trigger structure.
Thanks,
Jonathan
Jonathan Cameron (2):
staging:iio: Make sure all triggers have a trigger_ops for the owner
field.
staging:iio: iio_trigger contains defunct owner field. Remove it.
drivers/staging/iio/adc/ad7192.c | 7 +++++-- drivers/staging/iio/adc/ad7793.c | 6 +++++- drivers/staging/iio/trigger.h | 2 -- .../staging/iio/trigger/iio-trig-periodic-rtc.c | 1 - 4 files changed, 10 insertions(+), 6 deletions(-)
Signature · 1 line
1.7.7.4
Jonathan Cameron
maintainerPATCH 1/2 staging:iio: Make sure all triggers have a trigger_ops for the owner field.
The core needs the owner field to prevent module removal whilst in use and uses it without confirming that the trigger_ops structure actually exists.
--- drivers/staging/iio/adc/ad7192.c | 6 +++++- drivers/staging/iio/adc/ad7793.c | 5 +++++ 2 files changed, 10 insertions(+), 1 deletions(-)
drivers/staging/iio/adc/ad7192.c +5 -1
@@ -609,6 +609,10 @@ static irqreturn_t ad7192_data_rdy_trig_poll(int irq, void *private)return IRQ_HANDLED ; } +static struct iio_trigger_ops ad7192_trigger_ops = { + .owner =THIS_MODULE , +}; +static int ad7192_probe_trigger (struct iio_dev *indio_dev) {struct ad7192_state *st =iio_priv (indio_dev);
@@ -621,7 +625,7 @@ static int ad7192_probe_trigger(struct iio_dev *indio_dev) ret = -ENOMEM ; goto error_ret; } - + st->trig->ops = &ad7192_trigger_ops; ret = request_irq(st->spi->irq, ad7192_data_rdy_trig_poll, IRQF_TRIGGER_LOW,
drivers/staging/iio/adc/ad7793.c +5 -0
@@ -475,6 +475,10 @@ static irqreturn_t ad7793_data_rdy_trig_poll(int irq, void *private)return IRQ_HANDLED ; } +static struct iio_trigger_ops ad7793_trigger_ops = { + .owner =THIS_MODULE , +}; +static int ad7793_probe_trigger (struct iio_dev *indio_dev) {struct ad7793_state *st =iio_priv (indio_dev);
@@ -487,6 +491,7 @@ static int ad7793_probe_trigger(struct iio_dev *indio_dev) ret = -ENOMEM ; goto error_ret; } + st->trig->ops = &ad7793_trigger_ops; ret = request_irq(st->spi->irq, ad7793_data_rdy_trig_poll,
Signature · 1 line
1.7.7.4
Jonathan Cameron
maintainerPATCH 2/2 staging:iio: iio_trigger contains defunct owner field. Remove it.
In reply to Jonathan CameronThis 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.
--- drivers/staging/iio/adc/ad7192.c | 1 - drivers/staging/iio/adc/ad7793.c | 1 - drivers/staging/iio/trigger.h | 2 -- .../staging/iio/trigger/iio-trig-periodic-rtc.c | 1 - 4 files changed, 0 insertions(+), 5 deletions(-)
drivers/staging/iio/adc/ad7192.c +0 -1
@@ -637,7 +637,6 @@ static int ad7192_probe_trigger(struct iio_dev *indio_dev)disable_irq_nosync (st->spi->irq); st->irq_dis = true; st->trig->dev.parent = &st->spi->dev; - st->trig->owner =THIS_MODULE ; st->trig->private_data = indio_dev; ret =iio_trigger_register (st->trig);
drivers/staging/iio/adc/ad7793.c +0 -1
@@ -504,7 +504,6 @@ static int ad7793_probe_trigger(struct iio_dev *indio_dev)disable_irq_nosync (st->spi->irq); st->irq_dis = true; st->trig->dev.parent = &st->spi->dev; - st->trig->owner =THIS_MODULE ; st->trig->private_data = indio_dev; ret =iio_trigger_register (st->trig);
drivers/staging/iio/trigger.h +0 -2
@@ -46,7 +46,6 @@ struct iio_trigger_ops {* @private_data: [DRIVER] device specific data * @list: [INTERN] used in maintenance of global trigger list * @alloc_list: [DRIVER] used for driver specific trigger list -* @owner: [DRIVER] used to monitor usage count of the trigger. * @use_count: use count for the trigger * @subirq_chip: [INTERN] associate 'virtual' irq chip. * @subirq_base: [INTERN] base number for irqs provided by trigger.
@@ -63,7 +62,6 @@ struct iio_trigger {void *private_data;struct list_head list;struct list_head alloc_list; -struct module *owner;int use_count;struct irq_chip subirq_chip;
drivers/staging/iio/trigger/iio-trig-periodic-rtc.c +0 -1
@@ -125,7 +125,6 @@ static int iio_trig_periodic_rtc_probe(struct platform_device *dev) goto error_put_trigger_and_remove_from_list; } trig->private_data = trig_info; - trig->owner =THIS_MODULE ; trig->ops = &iio_prtc_trigger_ops;/* RTC access */ trig_info->rtc
Signature · 1 line
1.7.7.4