From: Jan Viktorin <viktorin@rehivetech.com>
To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Jan Viktorin <viktorin@rehivetech.com>,
Rob Herring <robh+dt@kernel.org>, Pawel Moll <pawel.moll@arm.com>,
Mark Rutland <mark.rutland@arm.com>,
Ian Campbell <ijc+devicetree@hellion.org.uk>,
Kumar Gala <galak@codeaurora.org>,
"Hans J. Koch" <hjk@hansjkoch.de>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Subject: [PATCH 2/4] uio: UIO_IRQ_NONE is a valid option for uioinfo->irq
Date: Tue, 17 May 2016 11:22:18 +0200 [thread overview]
Message-ID: <1463476940-26791-3-git-send-email-viktorin@rehivetech.com> (raw)
In-Reply-To: <1463476940-26791-1-git-send-email-viktorin@rehivetech.com>
We can simplify handling of platform_get_irq into one place as it is
acceptable to see UIO_IRQ_NONE instead of a valid IRQ number. Some
devices don't have or don't need any interrupt to be handled. The
same change has been already done for uio_pdrv_genirq.
Signed-off-by: Jan Viktorin <viktorin@rehivetech.com>
---
drivers/uio/uio_dmem_genirq.c | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/drivers/uio/uio_dmem_genirq.c b/drivers/uio/uio_dmem_genirq.c
index e1134a4..945515d 100644
--- a/drivers/uio/uio_dmem_genirq.c
+++ b/drivers/uio/uio_dmem_genirq.c
@@ -165,13 +165,6 @@ static int uio_dmem_genirq_probe(struct platform_device *pdev)
}
uioinfo->name = pdev->dev.of_node->name;
uioinfo->version = "devicetree";
-
- /* Multiple IRQs are not supported */
- irq = platform_get_irq(pdev, 0);
- if (irq == -ENXIO)
- uioinfo->irq = UIO_IRQ_NONE;
- else
- uioinfo->irq = irq;
}
if (!uioinfo || !uioinfo->name || !uioinfo->version) {
@@ -200,14 +193,18 @@ static int uio_dmem_genirq_probe(struct platform_device *pdev)
priv->pdev = pdev;
mutex_init(&priv->alloc_lock);
+ /* Multiple IRQs are not supported */
if (!uioinfo->irq) {
ret = platform_get_irq(pdev, 0);
- if (ret < 0) {
+ uioinfo->irq = ret;
+ if (ret == -ENXIO && pdev->dev.of_node)
+ uioinfo->irq = UIO_IRQ_NONE;
+ else if (ret < 0) {
dev_err(&pdev->dev, "failed to get IRQ\n");
goto bad1;
}
- uioinfo->irq = ret;
}
+
uiomem = &uioinfo->mem[0];
for (i = 0; i < pdev->num_resources; ++i) {
--
2.8.0
next prev parent reply other threads:[~2016-05-17 9:32 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-17 9:22 [PATCH 0/4] Fix and extend uio_dmem_genirq Jan Viktorin
2016-05-17 9:22 ` [PATCH 1/4] uio: fix dmem_region_start computation Jan Viktorin
2016-05-17 9:22 ` Jan Viktorin [this message]
2016-08-31 11:04 ` [PATCH 2/4] uio: UIO_IRQ_NONE is a valid option for uioinfo->irq Greg Kroah-Hartman
2016-05-17 9:22 ` [PATCH 3/4] uio: introduce devicetree bindings for uio_dmem_genirq Jan Viktorin
2016-05-18 17:01 ` Rob Herring
2016-05-19 8:45 ` Jan Viktorin
2016-05-23 20:36 ` Rob Herring
2016-06-23 8:31 ` Anup Patel
2016-05-17 9:22 ` [PATCH 4/4] uio: bind uio_pdrv_genirq via OF Jan Viktorin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1463476940-26791-3-git-send-email-viktorin@rehivetech.com \
--to=viktorin@rehivetech.com \
--cc=devicetree@vger.kernel.org \
--cc=galak@codeaurora.org \
--cc=gregkh@linuxfoundation.org \
--cc=hjk@hansjkoch.de \
--cc=ijc+devicetree@hellion.org.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=pawel.moll@arm.com \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).