iio: dummy: evgen: use irq_sim

Switch to using the recently added interrupt simulator for dummy irqs.

Signed-off-by Bartosz Golaszewski <[email protected]>

static int iio_dummy_evgen_create(void)
{

drivers/iio/dummy/iio_dummy_evgen.c +1 -1

-	int ret, i;
+	int ret;
 

drivers/iio/dummy/iio_dummy_evgen.c +0 -4

 		return ret;
-	}
-	iio_evgen->chip.name = iio_evgen_name;
-	iio_evgen->chip.irq_mask = &iio_dummy_event_irqmask;
-	iio_evgen->chip.irq_unmask = &iio_dummy_event_irqunmask;

drivers/iio/dummy/iio_dummy_evgen.c +5 -2

 	mutex_init(&iio_evgen->lock);
+
 	return 0;
 }

@@ -132,15 +79,17 @@ int iio_dummy_evgen_get_irq(void)
 		return -ENODEV;
 
 	mutex_lock(&iio_evgen->lock);
-	for (i = 0; i < IIO_EVENTGEN_NO; i++)
+	for (i = 0; i < IIO_EVENTGEN_NO; i++) {
 		if (!iio_evgen->inuse[i]) {
-			ret = iio_evgen->base + i;
+			ret = irq_sim_irqnum(&iio_evgen->irq_sim, i);
 			iio_evgen->inuse[i] = true;
 			break;
 		}
+	}
 	mutex_unlock(&iio_evgen->lock);
 	if (i == IIO_EVENTGEN_NO)
 		return -ENOMEM;
+
 	return ret;
 }

Quoted 3 lines

Switch to using the recently added interrupt simulator for dummy irqs.

Signed-off-by Bartosz Golaszewski <[email protected]>

Thanks for doing this.

[...]

Quoted 9 lines

static int iio_dummy_evgen_create(void)
{

drivers/iio/dummy/iio_dummy_evgen.c +1 -1

-     int ret, i;
+     int ret;
 
      iio_evgen = kzalloc(sizeof(*iio_evgen), GFP_KERNEL);
      if (!iio_evgen)
              return -ENOMEM;

drivers/iio/dummy/iio_dummy_evgen.c line 59

Quoted 6 lines

drivers/iio/dummy/iio_dummy_evgen.c +2 -4

-     iio_evgen->base = irq_alloc_descs(-1, 0, IIO_EVENTGEN_NO, 0);
-     if (iio_evgen->base < 0) {
-             ret = iio_evgen->base;
-             kfree(iio_evgen);
+     ret = irq_sim_init(&iio_evgen->irq_sim, IIO_EVENTGEN_NO);
+     if (ret)

What happened to the kfree(iio_evgen)?

Quoted 5 lines

              return ret;

drivers/iio/dummy/iio_dummy_evgen.c +0 -4

-     }
-     iio_evgen->chip.name = iio_evgen_name;
-     iio_evgen->chip.irq_mask = &iio_dummy_event_irqmask;
-     iio_evgen->chip.irq_unmask = &iio_dummy_event_irqunmask;

drivers/iio/dummy/iio_dummy_evgen.c line 62

Quoted 10 lines

drivers/iio/dummy/iio_dummy_evgen.c +2 -8

-     for (i = 0; i < IIO_EVENTGEN_NO; i++) {
-             irq_set_chip(iio_evgen->base + i, &iio_evgen->chip);
-             irq_set_handler(iio_evgen->base + i, &handle_simple_irq);
-             irq_modify_status(iio_evgen->base + i,
-                               IRQ_NOREQUEST | IRQ_NOAUTOEN,
-                               IRQ_NOPROBE);
-     }
-     init_irq_work(&iio_evgen->handler.work, iio_dummy_work_handler);
+
+     iio_evgen->base = irq_sim_irqnum(&iio_evgen->irq_sim, 0);

I saw you introduced irq_sim_baseirq(), to get rid of ->base. But as far as I can see the only remaining places where we need the base is to do the reverse lookup from IRQ to index. It would be nice if the irq_sim had a function for that, then we wouldn't have to know about the base at all.

Quoted 15 lines

Quoted 15 lines

              return ret;

drivers/iio/dummy/iio_dummy_evgen.c +2 -12

-     }
-     iio_evgen->chip.name = iio_evgen_name;
-     iio_evgen->chip.irq_mask = &iio_dummy_event_irqmask;
-     iio_evgen->chip.irq_unmask = &iio_dummy_event_irqunmask;
-     for (i = 0; i < IIO_EVENTGEN_NO; i++) {
-             irq_set_chip(iio_evgen->base + i, &iio_evgen->chip);
-             irq_set_handler(iio_evgen->base + i, &handle_simple_irq);
-             irq_modify_status(iio_evgen->base + i,
-                               IRQ_NOREQUEST | IRQ_NOAUTOEN,
-                               IRQ_NOPROBE);
-     }
-     init_irq_work(&iio_evgen->handler.work, iio_dummy_work_handler);
+
+     iio_evgen->base = irq_sim_irqnum(&iio_evgen->irq_sim, 0);

Quoted 5 lines

I saw you introduced irq_sim_baseirq(), to get rid of ->base. But as far as I can see the only remaining places where we need the base is to do the reverse lookup from IRQ to index. It would be nice if the irq_sim had a function for that, then we wouldn't have to know about the base at all.

I'm not sure I understand. Irq sim doesn't know anything about iio data structures, so how would such a reverse lookup work in this case?

Quoted 21 lines

Quoted 20 lines

Quoted 5 lines

              return ret;

drivers/iio/dummy/iio_dummy_evgen.c +0 -4

-     }
-     iio_evgen->chip.name = iio_evgen_name;
-     iio_evgen->chip.irq_mask = &iio_dummy_event_irqmask;
-     iio_evgen->chip.irq_unmask = &iio_dummy_event_irqunmask;

drivers/iio/dummy/iio_dummy_evgen.c line 62

Quoted 10 lines

drivers/iio/dummy/iio_dummy_evgen.c +2 -8

-     for (i = 0; i < IIO_EVENTGEN_NO; i++) {
-             irq_set_chip(iio_evgen->base + i, &iio_evgen->chip);
-             irq_set_handler(iio_evgen->base + i, &handle_simple_irq);
-             irq_modify_status(iio_evgen->base + i,
-                               IRQ_NOREQUEST | IRQ_NOAUTOEN,
-                               IRQ_NOPROBE);
-     }
-     init_irq_work(&iio_evgen->handler.work, iio_dummy_work_handler);
+
+     iio_evgen->base = irq_sim_irqnum(&iio_evgen->irq_sim, 0);

I saw you introduced irq_sim_baseirq(), to get rid of ->base. But as far as I can see the only remaining places where we need the base is to do the reverse lookup from IRQ to index. It would be nice if the irq_sim had a function for that, then we wouldn't have to know about the base at all.

Quoted 2 lines

I'm not sure I understand. Irq sim doesn't know anything about iio data structures, so how would such a reverse lookup work in this case?

Reverse lookup in the sense of translating IRQ number to offset. All we ever do with the base in the IIO code is irq - base to get the offset. I'd hide that calculation in a helper in the irq_sim code. This nicely splits functionality and implementation, the IIO code doesn't have to know how to get offset from the IRQ.