From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Thu, 13 Mar 2014 21:16:24 +0000 (-0700)
Subject: staging: comedi: gsc_hpdi: remove disable_plx_interrupts()
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=42ea78126c3f6c7a51fdf2c970e1d67f0a5faa19;p=deliverable%2Flinux.git

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>
---

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)