2010-06-09 23:08:46

by Hans J. Koch

[permalink] [raw]
Subject: [PATCH 0/3] uio: Remove IRQF_DISABLED flag from Userspace IO drivers

The interrupt flag IRQF_DISABLED is deprecated now. This small patch series
removes all uses of this flag in drivers/uio/.

Thanks,
Hans


2010-06-09 23:12:39

by Hans J. Koch

[permalink] [raw]
Subject: [PATCH 1/3] uio: Remove IRQF_DISABLED flag from uio_pdrv_genirq.c

Remove IRQF_DISABLED flag since it is deprecated and a no-op in the
current kernel.

Signed-off-by: Hans J. Koch <[email protected]>
---
drivers/uio/uio_pdrv_genirq.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/drivers/uio/uio_pdrv_genirq.c b/drivers/uio/uio_pdrv_genirq.c
index 61e569d..7174d51 100644
--- a/drivers/uio/uio_pdrv_genirq.c
+++ b/drivers/uio/uio_pdrv_genirq.c
@@ -155,7 +155,6 @@ static int uio_pdrv_genirq_probe(struct platform_device *pdev)
* Interrupt sharing is not supported.
*/

- uioinfo->irq_flags |= IRQF_DISABLED;
uioinfo->handler = uio_pdrv_genirq_handler;
uioinfo->irqcontrol = uio_pdrv_genirq_irqcontrol;
uioinfo->open = uio_pdrv_genirq_open;
--
1.7.0

2010-06-09 23:15:55

by Hans J. Koch

[permalink] [raw]
Subject: [PATCH 2/3] uio: Remove IRQF_DISABLED from uio_sercos3.c

Remove IRQF_DISABLED since it is deprecated and a no-op in the
current kernel.

Signed-off-by: Hans J. Koch <[email protected]>
---
drivers/uio/uio_sercos3.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/uio/uio_sercos3.c b/drivers/uio/uio_sercos3.c
index 3d461cd..a187fa1 100644
--- a/drivers/uio/uio_sercos3.c
+++ b/drivers/uio/uio_sercos3.c
@@ -154,7 +154,7 @@ static int __devinit sercos3_pci_probe(struct pci_dev *dev,
info->name = "Sercos_III_PCI";
info->version = "0.0.1";
info->irq = dev->irq;
- info->irq_flags = IRQF_DISABLED | IRQF_SHARED;
+ info->irq_flags = IRQF_SHARED;
info->handler = sercos3_handler;
info->irqcontrol = sercos3_irqcontrol;

--
1.7.0

2010-06-09 23:18:14

by Hans J. Koch

[permalink] [raw]
Subject: [PATCH 3/3] uio: Remove IRQF_DISABLED flag from uio_cif.c

Remove IRQF_DISABLED since it is deprecated and a no-op in the
current kernel.

Signed-off-by: Hans J. Koch <[email protected]>
---
drivers/uio/uio_cif.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/uio/uio_cif.c b/drivers/uio/uio_cif.c
index 371f87f..a8ea2f1 100644
--- a/drivers/uio/uio_cif.c
+++ b/drivers/uio/uio_cif.c
@@ -79,7 +79,7 @@ static int __devinit hilscher_pci_probe(struct pci_dev *dev,
}
info->version = "0.0.1";
info->irq = dev->irq;
- info->irq_flags = IRQF_DISABLED | IRQF_SHARED;
+ info->irq_flags = IRQF_SHARED;
info->handler = hilscher_handler;

if (uio_register_device(&dev->dev, info))
--
1.7.0

2010-06-10 15:14:23

by John Ogness

[permalink] [raw]
Subject: [PATCH 2/3] uio: Remove IRQF_DISABLED from uio_sercos3.c

Remove IRQF_DISABLED since it is deprecated and a no-op in the
current kernel.

Acked-by: John Ogness <[email protected]>
Signed-off-by: Hans J. Koch <[email protected]>
---
drivers/uio/uio_sercos3.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/uio/uio_sercos3.c b/drivers/uio/uio_sercos3.c
index 3d461cd..a187fa1 100644
--- a/drivers/uio/uio_sercos3.c
+++ b/drivers/uio/uio_sercos3.c
@@ -154,7 +154,7 @@ static int __devinit sercos3_pci_probe(struct pci_dev *dev,
info->name = "Sercos_III_PCI";
info->version = "0.0.1";
info->irq = dev->irq;
- info->irq_flags = IRQF_DISABLED | IRQF_SHARED;
+ info->irq_flags = IRQF_SHARED;
info->handler = sercos3_handler;
info->irqcontrol = sercos3_irqcontrol;

--
1.7.0