evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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: Jonathan Cameron <jic23@kernel.org>
Reviewed-by: Lars-Peter Clausen <lars@metafoo.de>
This commit is contained in:
Jonathan Cameron 2013-06-02 20:00:00 +01:00
parent d4fd73bf25
commit 3c1e02dbb3
1 changed files with 39 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
drivers/staging/iio/trigger/iio-trig-interrupt.c
View file

@ -17,11 +17,8 @@
#include <linux/iio/iio.h> #include <linux/iio/iio.h>
#include <linux/iio/trigger.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 iio_interrupt_trigger_info {
struct mutex in_use;
unsigned int irq; 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) static int iio_interrupt_trigger_probe(struct platform_device *pdev)
{ {
struct iio_interrupt_trigger_info *trig_info; struct iio_interrupt_trigger_info *trig_info;
struct iio_trigger *trig, *trig2; struct iio_trigger *trig;
unsigned long irqflags; unsigned long irqflags;
struct resource *irq_res; 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, 0);
irq_res = platform_get_resource(pdev,
IORESOURCE_IRQ, irq_res_cnt); 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; 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) { if (!trig) {
ret = -ENOMEM; ret = -ENOMEM;
goto error_free_completed_registrations; goto error_ret;
} }
trig_info = kzalloc(sizeof(*trig_info), GFP_KERNEL); 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); ret = iio_trigger_register(trig);
if (ret) if (ret)
goto error_release_irq; goto error_release_irq;
platform_set_drvdata(pdev, trig);
list_add_tail(&trig->alloc_list,
&iio_interrupt_trigger_list);
}
irq_res_cnt++;
} while (irq_res != NULL);
return 0; return 0;
@ -100,38 +86,21 @@ error_free_trig_info:
kfree(trig_info); kfree(trig_info);
error_put_trigger: error_put_trigger:
iio_trigger_put(trig); iio_trigger_put(trig);
error_free_completed_registrations: error_ret:
/* 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);
}
return ret; return ret;
} }
static int iio_interrupt_trigger_remove(struct platform_device *pdev) 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; struct iio_interrupt_trigger_info *trig_info;
mutex_lock(&iio_interrupt_trigger_list_lock); trig = platform_get_drvdata(pdev);
list_for_each_entry_safe(trig,
trig2,
&iio_interrupt_trigger_list,
alloc_list) {
trig_info = iio_trigger_get_drvdata(trig); trig_info = iio_trigger_get_drvdata(trig);
iio_trigger_unregister(trig); iio_trigger_unregister(trig);
free_irq(trig_info->irq, trig); free_irq(trig_info->irq, trig);
kfree(trig_info); kfree(trig_info);
iio_trigger_put(trig); iio_trigger_put(trig);
}
mutex_unlock(&iio_interrupt_trigger_list_lock);
return 0; return 0;
} }