2008-10-29 17:26:48

by Mike Frysinger

Subject: [PATCH] UIO: uio_pdrv_genirq: allow custom irq_flags

I can't think of a reason why the driver prevents people from setting any
custom bits in their platform device, but I can think of some reasons for
allowing custom flags. Like setting the IRQF_TRIGGER_... bits.

Signed-off-by: Mike Frysinger <[email protected]>
---
drivers/uio/uio_pdrv_genirq.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/uio/uio_pdrv_genirq.c b/drivers/uio/uio_pdrv_genirq.c
index 1f82c83..8695245 100644
--- a/drivers/uio/uio_pdrv_genirq.c
+++ b/drivers/uio/uio_pdrv_genirq.c
@@ -81,7 +81,7 @@ static int uio_pdrv_genirq_probe(struct platform_device *pdev)
goto bad0;
}

- if (uioinfo->handler || uioinfo->irqcontrol || uioinfo->irq_flags) {
+ if (uioinfo->handler || uioinfo->irqcontrol) {
dev_err(&pdev->dev, "interrupt configuration error\n");
goto bad0;
}
@@ -132,7 +132,7 @@ static int uio_pdrv_genirq_probe(struct platform_device *pdev)
* Interrupt sharing is not supported.
*/

- uioinfo->irq_flags = IRQF_DISABLED;
+ uioinfo->irq_flags |= IRQF_DISABLED;
uioinfo->handler = uio_pdrv_genirq_handler;
uioinfo->irqcontrol = uio_pdrv_genirq_irqcontrol;
uioinfo->priv = priv;
--
1.6.0.2

2008-10-29 21:28:42

by Hans J. Koch

Subject: Re: [PATCH] UIO: uio_pdrv_genirq: allow custom irq_flags

On Wed, Oct 29, 2008 at 01:26:35PM -0400, Mike Frysinger wrote:
> I can't think of a reason why the driver prevents people from setting any
> custom bits in their platform device,

The reason was to prevent people from adding IRQF_SHARED since that
won't work.

> but I can think of some reasons for
> allowing custom flags. Like setting the IRQF_TRIGGER_... bits.

Sounds OK to me, but then you have to check that IRQF_SHARED is _not_
set in pdev->uioinfo->irq_flags.
Could you send a new patch that does this?

Magnus, any comments?

Thanks,
Hans


>
> Signed-off-by: Mike Frysinger <[email protected]>
> ---
> drivers/uio/uio_pdrv_genirq.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/uio/uio_pdrv_genirq.c b/drivers/uio/uio_pdrv_genirq.c
> index 1f82c83..8695245 100644
> --- a/drivers/uio/uio_pdrv_genirq.c
> +++ b/drivers/uio/uio_pdrv_genirq.c
> @@ -81,7 +81,7 @@ static int uio_pdrv_genirq_probe(struct platform_device *pdev)
> goto bad0;
> }
>
> - if (uioinfo->handler || uioinfo->irqcontrol || uioinfo->irq_flags) {
> + if (uioinfo->handler || uioinfo->irqcontrol) {
> dev_err(&pdev->dev, "interrupt configuration error\n");
> goto bad0;
> }
> @@ -132,7 +132,7 @@ static int uio_pdrv_genirq_probe(struct platform_device *pdev)
> * Interrupt sharing is not supported.
> */
>
> - uioinfo->irq_flags = IRQF_DISABLED;
> + uioinfo->irq_flags |= IRQF_DISABLED;
> uioinfo->handler = uio_pdrv_genirq_handler;
> uioinfo->irqcontrol = uio_pdrv_genirq_irqcontrol;
> uioinfo->priv = priv;
> --
> 1.6.0.2