diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2014-06-20 11:10:21 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-29 14:17:58 -0700 |
| commit | 614b5cf097faabb969a0f7bc0f0a5eff3e48a07f (patch) | |
| tree | ada566783b73307f201aa4a5dbe0a661e649a94a /drivers/staging/comedi | |
| parent | a55e9067f3b08ef58764ef505a4d0a4fc754ba07 (diff) | |
staging: comedi: ni_mio_common.c: remove interrupt_pin() macros
Pass the 'interrupt_pin' to ni_E_init() and remove the macros.
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>
Diffstat (limited to 'drivers/staging/comedi')
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_atmio.c | 4 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_mio_common.c | 6 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_mio_cs.c | 4 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_pcimio.c | 3 |
4 files changed, 6 insertions, 11 deletions
diff --git a/drivers/staging/comedi/drivers/ni_atmio.c b/drivers/staging/comedi/drivers/ni_atmio.c index 5c6c06791b88..5fe66a5ad686 100644 --- a/drivers/staging/comedi/drivers/ni_atmio.c +++ b/drivers/staging/comedi/drivers/ni_atmio.c @@ -264,8 +264,6 @@ static const int ni_irqpin[] = { -1, -1, -1, 0, 1, 2, -1, 3, -1, -1, 4, 5, 6, -1, -1, 7 }; -#define interrupt_pin(a) (ni_irqpin[(a)]) - #define IRQ_POLARITY 0 #define NI_E_IRQ_FLAGS 0 @@ -406,7 +404,7 @@ static int ni_atmio_attach(struct comedi_device *dev, /* generic E series stuff in ni_mio_common.c */ - ret = ni_E_init(dev); + ret = ni_E_init(dev, ni_irqpin[dev->irq]); if (ret < 0) return ret; diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c index b2d6b1d1807d..e9b9c851922a 100644 --- a/drivers/staging/comedi/drivers/ni_mio_common.c +++ b/drivers/staging/comedi/drivers/ni_mio_common.c @@ -5604,7 +5604,7 @@ static int ni_alloc_private(struct comedi_device *dev) return 0; } -static int ni_E_init(struct comedi_device *dev) +static int ni_E_init(struct comedi_device *dev, unsigned interrupt_pin) { const struct ni_board_struct *board = comedi_board(dev); struct ni_private *devpriv = dev->private; @@ -5908,8 +5908,8 @@ static int ni_E_init(struct comedi_device *dev) (IRQ_POLARITY ? Interrupt_Output_Polarity : 0) | (Interrupt_Output_On_3_Pins & 0) | Interrupt_A_Enable | Interrupt_B_Enable | - Interrupt_A_Output_Select(interrupt_pin(dev->irq)) | - Interrupt_B_Output_Select(interrupt_pin(dev->irq)), + Interrupt_A_Output_Select(interrupt_pin) | + Interrupt_B_Output_Select(interrupt_pin), Interrupt_Control_Register); } diff --git a/drivers/staging/comedi/drivers/ni_mio_cs.c b/drivers/staging/comedi/drivers/ni_mio_cs.c index ae82813070bd..e61b5d1bdb41 100644 --- a/drivers/staging/comedi/drivers/ni_mio_cs.c +++ b/drivers/staging/comedi/drivers/ni_mio_cs.c @@ -137,8 +137,6 @@ static const struct ni_board_struct ni_boards[] = { #endif }; -#define interrupt_pin(a) 0 - #define IRQ_POLARITY 1 #include "ni_mio_common.c" @@ -205,7 +203,7 @@ static int mio_cs_auto_attach(struct comedi_device *dev, devpriv = dev->private; - return ni_E_init(dev); + return ni_E_init(dev, 0); } static void mio_cs_detach(struct comedi_device *dev) diff --git a/drivers/staging/comedi/drivers/ni_pcimio.c b/drivers/staging/comedi/drivers/ni_pcimio.c index faa7eb7f1d97..fba5a9c4feb6 100644 --- a/drivers/staging/comedi/drivers/ni_pcimio.c +++ b/drivers/staging/comedi/drivers/ni_pcimio.c @@ -1042,7 +1042,6 @@ static const struct ni_board_struct ni_boards[] = { }, }; -#define interrupt_pin(a) 0 #define IRQ_POLARITY 1 #define NI_E_IRQ_FLAGS IRQF_SHARED @@ -1274,7 +1273,7 @@ static int pcimio_auto_attach(struct comedi_device *dev, dev->irq = irq; } - ret = ni_E_init(dev); + ret = ni_E_init(dev, 0); if (ret < 0) return ret; |