openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
H Hartley Sweeten 2014-06-20 11:10:21 -07:00 committed by Greg Kroah-Hartman
parent a55e9067f3
commit 614b5cf097
4 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/comedi/drivers/ni_atmio.c
View File

@ -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 -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 IRQ_POLARITY 0
#define NI_E_IRQ_FLAGS 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 */ /* 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) if (ret < 0)
return ret; return ret;

6
drivers/staging/comedi/drivers/ni_mio_common.c
View File

@ -5604,7 +5604,7 @@ static int ni_alloc_private(struct comedi_device *dev)
return 0; 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); const struct ni_board_struct *board = comedi_board(dev);
struct ni_private *devpriv = dev->private; 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) | (IRQ_POLARITY ? Interrupt_Output_Polarity : 0) |
(Interrupt_Output_On_3_Pins & 0) | (Interrupt_Output_On_3_Pins & 0) |
Interrupt_A_Enable | Interrupt_B_Enable | Interrupt_A_Enable | Interrupt_B_Enable |
Interrupt_A_Output_Select(interrupt_pin(dev->irq)) | Interrupt_A_Output_Select(interrupt_pin) |
Interrupt_B_Output_Select(interrupt_pin(dev->irq)), Interrupt_B_Output_Select(interrupt_pin),
Interrupt_Control_Register); Interrupt_Control_Register);
} }

4
drivers/staging/comedi/drivers/ni_mio_cs.c
View File

@ -137,8 +137,6 @@ static const struct ni_board_struct ni_boards[] = {
#endif #endif
}; };
#define interrupt_pin(a) 0
#define IRQ_POLARITY 1 #define IRQ_POLARITY 1
#include "ni_mio_common.c" #include "ni_mio_common.c"
@ -205,7 +203,7 @@ static int mio_cs_auto_attach(struct comedi_device *dev,
devpriv = dev->private; devpriv = dev->private;
return ni_E_init(dev); return ni_E_init(dev, 0);
} }
static void mio_cs_detach(struct comedi_device *dev) static void mio_cs_detach(struct comedi_device *dev)

3
drivers/staging/comedi/drivers/ni_pcimio.c
View File

@ -1042,7 +1042,6 @@ static const struct ni_board_struct ni_boards[] = {
}, },
}; };
#define interrupt_pin(a) 0
#define IRQ_POLARITY 1 #define IRQ_POLARITY 1
#define NI_E_IRQ_FLAGS IRQF_SHARED #define NI_E_IRQ_FLAGS IRQF_SHARED
@ -1274,7 +1273,7 @@ static int pcimio_auto_attach(struct comedi_device *dev,
dev->irq = irq; dev->irq = irq;
} }
ret = ni_E_init(dev); ret = ni_E_init(dev, 0);
if (ret < 0) if (ret < 0)
return ret; return ret;