From: H Hartley Sweeten Date: Fri, 20 Jun 2014 18:10:22 +0000 (-0700) Subject: staging: comedi: ni_mio_common drivers: remove NI_E_IRQ_FLAGS defines X-Git-Tag: v3.17-rc1~123^2~1302 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=32d878a285250fd30acda57033a9e51e77ab50a3;p=karo-tx-linux.git staging: comedi: ni_mio_common drivers: remove NI_E_IRQ_FLAGS defines These defines are only used in the request_irq() calls. Remove them and just open code the values. Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/ni_atmio.c b/drivers/staging/comedi/drivers/ni_atmio.c index 5fe66a5ad686..a5c7ceaa771f 100644 --- a/drivers/staging/comedi/drivers/ni_atmio.c +++ b/drivers/staging/comedi/drivers/ni_atmio.c @@ -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) { diff --git a/drivers/staging/comedi/drivers/ni_pcimio.c b/drivers/staging/comedi/drivers/ni_pcimio.c index fba5a9c4feb6..07b70270ac79 100644 --- a/drivers/staging/comedi/drivers/ni_pcimio.c +++ b/drivers/staging/comedi/drivers/ni_pcimio.c @@ -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;