Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c1e02db authored by Jonathan Cameron's avatar Jonathan Cameron
Browse files

staging:iio:triggers:interrupt trigger - one per platform device. 



Switching from one platform device registering a lot of triggers
to one for each trigger simplifies the code somewhat. It would be
relatively unusual to have more than a couple of such devices
registered so this change will not result in much additional overhead.

Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
Reviewed-by: default avatarLars-Peter Clausen <lars@metafoo.de>
parent d4fd73bf

drivers/staging/iio/trigger/iio-trig-interrupt.c

+45 −76
Original line number Diff line number Diff line
@@ -17,11 +17,8 @@ 
#include <linux/iio/iio.h>

#include <linux/iio/trigger.h>



static LIST_HEAD(iio_interrupt_trigger_list);

static DEFINE_MUTEX(iio_interrupt_trigger_list_lock);



struct iio_interrupt_trigger_info {

	struct mutex in_use;

	unsigned int irq;

};
@@ -39,28 +36,24 @@ static const struct iio_trigger_ops iio_interrupt_trigger_ops = { 
static int iio_interrupt_trigger_probe(struct platform_device *pdev)

{

	struct iio_interrupt_trigger_info *trig_info;

	struct iio_trigger *trig, *trig2;

	struct iio_trigger *trig;

	unsigned long irqflags;

	struct resource *irq_res;

	int irq, ret = 0, irq_res_cnt = 0;

	int irq, ret = 0;



	do {

		irq_res = platform_get_resource(pdev,

				IORESOURCE_IRQ, irq_res_cnt);

	irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);



	if (irq_res == NULL)

		return -ENODEV;



		if (irq_res == NULL) {

			if (irq_res_cnt == 0)

				dev_err(&pdev->dev, "No IRQs specified");

			break;

		}

	irqflags = (irq_res->flags & IRQF_TRIGGER_MASK) | IRQF_SHARED;



		for (irq = irq_res->start; irq <= irq_res->end; irq++) {

	irq = irq_res->start;



			trig = iio_trigger_alloc("irqtrig%d", irq);

	trig = iio_trigger_alloc("irqtrig%d", irq_res->start);

	if (!trig) {

		ret = -ENOMEM;

				goto error_free_completed_registrations;

		goto error_ret;

	}



	trig_info = kzalloc(sizeof(*trig_info), GFP_KERNEL);
@@ -82,14 +75,7 @@ static int iio_interrupt_trigger_probe(struct platform_device *pdev) 
	ret = iio_trigger_register(trig);

	if (ret)

		goto error_release_irq;



			list_add_tail(&trig->alloc_list,

					&iio_interrupt_trigger_list);

		}



		irq_res_cnt++;

	} while (irq_res != NULL);



	platform_set_drvdata(pdev, trig);



	return 0;
@@ -100,38 +86,21 @@ static int iio_interrupt_trigger_probe(struct platform_device *pdev) 
	kfree(trig_info);

error_put_trigger:

	iio_trigger_put(trig);

error_free_completed_registrations:

	/* The rest should have been added to the iio_interrupt_trigger_list */

	list_for_each_entry_safe(trig,

				 trig2,

				 &iio_interrupt_trigger_list,

				 alloc_list) {

		trig_info = iio_trigger_get_drvdata(trig);

		free_irq(trig_info->irq, trig);

		kfree(trig_info);

		iio_trigger_unregister(trig);

	}



error_ret:

	return ret;

}



static int iio_interrupt_trigger_remove(struct platform_device *pdev)

{

	struct iio_trigger *trig, *trig2;

	struct iio_trigger *trig;

	struct iio_interrupt_trigger_info *trig_info;



	mutex_lock(&iio_interrupt_trigger_list_lock);

	list_for_each_entry_safe(trig,

				 trig2,

				 &iio_interrupt_trigger_list,

				 alloc_list) {

	trig = platform_get_drvdata(pdev);

	trig_info = iio_trigger_get_drvdata(trig);

	iio_trigger_unregister(trig);

	free_irq(trig_info->irq, trig);

	kfree(trig_info);

	iio_trigger_put(trig);

	}

	mutex_unlock(&iio_interrupt_trigger_list_lock);



	return 0;

}