Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 614b5cf0 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a55e9067

drivers/staging/comedi/drivers/ni_atmio.c

+1 −3
Original line number Diff line number Diff line
@@ -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;

drivers/staging/comedi/drivers/ni_mio_common.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

	}

drivers/staging/comedi/drivers/ni_mio_cs.c

+1 −3
Original line number Diff line number Diff line
@@ -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)

drivers/staging/comedi/drivers/ni_pcimio.c

+1 −2
Original line number Diff line number Diff line
@@ -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;