summaryrefslogtreecommitdiff
path: root/drivers/staging/comedi
diff options
context:
space:
mode:
authorH Hartley Sweeten <hartleys@visionengravers.com>2014-03-13 14:16:24 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-03-17 14:19:50 -0700
commit42ea78126c3f6c7a51fdf2c970e1d67f0a5faa19 (patch)
tree9460a4aa740732ec6300d39a231a4b9d61a8e6e8 /drivers/staging/comedi
parent63da0d087c9e1d3ba785470a234ba7be6f1c78b3 (diff)
staging: comedi: gsc_hpdi: remove disable_plx_interrupts()
This helper function is just a simple writel(). Remove it. 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/gsc_hpdi.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/staging/comedi/drivers/gsc_hpdi.c b/drivers/staging/comedi/drivers/gsc_hpdi.c
index d9b1491b130b..3762510933dc 100644
--- a/drivers/staging/comedi/drivers/gsc_hpdi.c
+++ b/drivers/staging/comedi/drivers/gsc_hpdi.c
@@ -209,13 +209,6 @@ struct hpdi_private {
volatile unsigned int block_size;
};
-static void disable_plx_interrupts(struct comedi_device *dev)
-{
- struct hpdi_private *devpriv = dev->private;
-
- writel(0, devpriv->plx9080_iobase + PLX_INTRCS_REG);
-}
-
static inline void hpdi_writel(struct comedi_device *dev, uint32_t bits,
unsigned int offset)
{
@@ -604,7 +597,7 @@ static void gsc_hpdi_init_plx9080(struct comedi_device *dev)
#endif
writel(bits, devpriv->plx9080_iobase + PLX_BIGEND_REG);
- disable_plx_interrupts(dev);
+ writel(0, devpriv->plx9080_iobase + PLX_INTRCS_REG);
gsc_hpdi_abort_dma(dev, 0);
gsc_hpdi_abort_dma(dev, 1);
@@ -743,7 +736,7 @@ static void gsc_hpdi_detach(struct comedi_device *dev)
free_irq(dev->irq, dev);
if (devpriv) {
if (devpriv->plx9080_iobase) {
- disable_plx_interrupts(dev);
+ writel(0, devpriv->plx9080_iobase + PLX_INTRCS_REG);
iounmap(devpriv->plx9080_iobase);
}
if (devpriv->hpdi_iobase)