Commit 5f315520 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: ni_stc.h: cleanup ni_e_series_enable_second_irq()

This function is used to enable/disable the second irq on NI e-series
boards. This irq used used to generate dma requests for the counters.

There are only 2 counters (NUM_GPCT) so the default case of the switch
can never occur.

Tidy up this function and remove the unreachable BUG().
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 17733219
...@@ -527,38 +527,31 @@ static void ni_release_cdo_mite_channel(struct comedi_device *dev) ...@@ -527,38 +527,31 @@ static void ni_release_cdo_mite_channel(struct comedi_device *dev)
#endif /* PCIDMA */ #endif /* PCIDMA */
} }
/* e-series boards use the second irq signals to generate dma requests for their counters */
#ifdef PCIDMA #ifdef PCIDMA
static void ni_e_series_enable_second_irq(struct comedi_device *dev, static void ni_e_series_enable_second_irq(struct comedi_device *dev,
unsigned gpct_index, short enable) unsigned gpct_index, short enable)
{ {
struct ni_private *devpriv = dev->private; struct ni_private *devpriv = dev->private;
uint16_t val = 0;
int reg;
if (devpriv->is_m_series) if (devpriv->is_m_series || gpct_index > 1)
return; return;
switch (gpct_index) {
case 0: /*
if (enable) { * e-series boards use the second irq signals to generate
devpriv->stc_writew(dev, G0_Gate_Second_Irq_Enable, * dma requests for their counters
Second_IRQ_A_Enable_Register); */
} else { if (gpct_index == 0) {
devpriv->stc_writew(dev, 0, reg = Second_IRQ_A_Enable_Register;
Second_IRQ_A_Enable_Register); if (enable)
} val = G0_Gate_Second_Irq_Enable;
break; } else {
case 1: reg = Second_IRQ_B_Enable_Register;
if (enable) { if (enable)
devpriv->stc_writew(dev, G1_Gate_Second_Irq_Enable, val = G1_Gate_Second_Irq_Enable;
Second_IRQ_B_Enable_Register);
} else {
devpriv->stc_writew(dev, 0,
Second_IRQ_B_Enable_Register);
}
break;
default:
BUG();
break;
} }
devpriv->stc_writew(dev, val, reg);
} }
#endif /* PCIDMA */ #endif /* PCIDMA */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment