diff options
| author | Benedikt Spranger <b.spranger@linutronix.de> | 2012-05-14 18:48:17 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-15 08:44:58 -0700 |
| commit | 94ca629e40eb7e997be21d8065c25e4f3797b03f (patch) | |
| tree | 4d6360473045502c736cd28c39ce2399e06f6f84 /drivers/uio | |
| parent | 7458eab6f4527bce719703eb15fef1cff9e8d9e0 (diff) | |
| download | kernel-common-94ca629e40eb7e997be21d8065c25e4f3797b03f.tar.gz kernel-common-94ca629e40eb7e997be21d8065c25e4f3797b03f.tar.bz2 kernel-common-94ca629e40eb7e997be21d8065c25e4f3797b03f.zip | |
uio_pdrv_genirq: get irq through platform resource if not set otherwise
Platform devices are configured through platform resources. The interrupt
in the driver uio_pdrv_genirq is instead configured through a side channel
i.e. the platform data structure. Make it possible to use the generic
configuration scheme via platform resource.
Signed-off-by: Benedikt Spranger <b.spranger@linutronix.de>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: "Hans J. Koch" <hjk@hansjkoch.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/uio')
| -rw-r--r-- | drivers/uio/uio_pdrv_genirq.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/uio/uio_pdrv_genirq.c b/drivers/uio/uio_pdrv_genirq.c index b98371d93a92..42202cd83158 100644 --- a/drivers/uio/uio_pdrv_genirq.c +++ b/drivers/uio/uio_pdrv_genirq.c @@ -146,6 +146,14 @@ static int uio_pdrv_genirq_probe(struct platform_device *pdev) priv->flags = 0; /* interrupt is enabled to begin with */ priv->pdev = pdev; + if (!uioinfo->irq) { + ret = platform_get_irq(pdev, 0); + if (ret < 0) { + dev_err(&pdev->dev, "failed to get IRQ\n"); + goto bad0; + } + uioinfo->irq = ret; + } uiomem = &uioinfo->mem[0]; for (i = 0; i < pdev->num_resources; ++i) { |