]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: comedi: ni_mio_common drivers: remove NI_E_IRQ_FLAGS defines
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Fri, 20 Jun 2014 18:10:22 +0000 (11:10 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 29 Jun 2014 21:17:58 +0000 (14:17 -0700)
These defines are only used in the request_irq() calls. Remove them
and just open code the values.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/ni_atmio.c
drivers/staging/comedi/drivers/ni_pcimio.c

index 5fe66a5ad686309f75d57ef92a874a7c0c449927..a5c7ceaa771f49504bdd551d0f0819f553fbfa4f 100644 (file)
@@ -266,8 +266,6 @@ static const int ni_irqpin[] = {
 
 #define IRQ_POLARITY 0
 
-#define NI_E_IRQ_FLAGS         0
-
 #include "ni_mio_common.c"
 
 static struct pnp_device_id device_ids[] = {
@@ -392,7 +390,7 @@ static int ni_atmio_attach(struct comedi_device *dev,
                        return -EINVAL;
                }
                printk(" ( irq = %u )", irq);
-               ret = request_irq(irq, ni_E_interrupt, NI_E_IRQ_FLAGS,
+               ret = request_irq(irq, ni_E_interrupt, 0,
                                  "ni_atmio", dev);
 
                if (ret < 0) {
index fba5a9c4feb6dc682aef37dc8003f08d16a73973..07b70270ac791cd7e6f62c15e08fdf5866e5cdd5 100644 (file)
@@ -1044,8 +1044,6 @@ static const struct ni_board_struct ni_boards[] = {
 
 #define IRQ_POLARITY 1
 
-#define NI_E_IRQ_FLAGS         IRQF_SHARED
-
 #include "ni_mio_common.c"
 
 static int pcimio_ai_change(struct comedi_device *dev,
@@ -1267,7 +1265,7 @@ static int pcimio_auto_attach(struct comedi_device *dev,
 
        irq = mite_irq(devpriv->mite);
        if (irq) {
-               ret = request_irq(irq, ni_E_interrupt, NI_E_IRQ_FLAGS,
+               ret = request_irq(irq, ni_E_interrupt, IRQF_SHARED,
                                  dev->board_name, dev);
                if (ret == 0)
                        dev->irq = irq;