From 4faa71ff91e783e70e23d86cbf870dc3a9899011 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Wed, 7 Oct 2015 14:52:42 -0700 Subject: [PATCH] staging: comedi: icp_multi: remove useless interrupt disable code This driver does not use interrupts and all the interrupt source are disabled by icp_multi_reset() when the board is first attached. Remove the unnecessary, and useless, disable and clearing of interrupts in the analog input and output (*insn_read) and (*insn_write) functions. This also removes the need for the private data members 'IntEnable' and 'IntStatus'. Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/icp_multi.c | 44 ++-------------------- 1 file changed, 3 insertions(+), 41 deletions(-) diff --git a/drivers/staging/comedi/drivers/icp_multi.c b/drivers/staging/comedi/drivers/icp_multi.c index b37ed42db75b..68d177040f94 100644 --- a/drivers/staging/comedi/drivers/icp_multi.c +++ b/drivers/staging/comedi/drivers/icp_multi.c @@ -95,8 +95,6 @@ static const char range_codes_analog[] = { 0x00, 0x20, 0x10, 0x30 }; struct icp_multi_private { unsigned int DacCmdStatus; /* DAC Command/Status register */ - unsigned int IntEnable; /* Interrupt Enable register */ - unsigned int IntStatus; /* Interrupt Status register */ }; static int icp_multi_ai_eoc(struct comedi_device *dev, @@ -117,7 +115,6 @@ static int icp_multi_insn_read_ai(struct comedi_device *dev, struct comedi_insn *insn, unsigned int *data) { - struct icp_multi_private *devpriv = dev->private; unsigned int chan = CR_CHAN(insn->chanspec); unsigned int range = CR_RANGE(insn->chanspec); unsigned int aref = CR_AREF(insn->chanspec); @@ -125,14 +122,6 @@ static int icp_multi_insn_read_ai(struct comedi_device *dev, int ret = 0; int n; - /* Disable A/D conversion ready interrupt */ - devpriv->IntEnable &= ~ICP_MULTI_INT_ADC_RDY; - writew(devpriv->IntEnable, dev->mmio + ICP_MULTI_INT_EN); - - /* Clear interrupt status */ - devpriv->IntStatus |= ICP_MULTI_INT_ADC_RDY; - writew(devpriv->IntStatus, dev->mmio + ICP_MULTI_INT_STAT); - /* Set mode and range data for specified channel */ if (aref == AREF_DIFF) { adc_csr = ICP_MULTI_ADC_CSR_DI_CHAN(chan) | @@ -158,14 +147,6 @@ static int icp_multi_insn_read_ai(struct comedi_device *dev, data[n] = (readw(dev->mmio + ICP_MULTI_AI) >> 4) & 0x0fff; } - /* Disable interrupt */ - devpriv->IntEnable &= ~ICP_MULTI_INT_ADC_RDY; - writew(devpriv->IntEnable, dev->mmio + ICP_MULTI_INT_EN); - - /* Clear interrupt status */ - devpriv->IntStatus |= ICP_MULTI_INT_ADC_RDY; - writew(devpriv->IntStatus, dev->mmio + ICP_MULTI_INT_STAT); - return ret ? ret : n; } @@ -192,14 +173,6 @@ static int icp_multi_ao_insn_write(struct comedi_device *dev, unsigned int range = CR_RANGE(insn->chanspec); int i; - /* Disable D/A conversion ready interrupt */ - devpriv->IntEnable &= ~ICP_MULTI_INT_DAC_RDY; - writew(devpriv->IntEnable, dev->mmio + ICP_MULTI_INT_EN); - - /* Clear interrupt status */ - devpriv->IntStatus |= ICP_MULTI_INT_DAC_RDY; - writew(devpriv->IntStatus, dev->mmio + ICP_MULTI_INT_STAT); - /* Set up range and channel data */ /* Bit 4 = 1 : Bipolar */ /* Bit 5 = 0 : 5V */ @@ -218,19 +191,8 @@ static int icp_multi_ao_insn_write(struct comedi_device *dev, /* Wait for analogue output data register to be * ready for new data, or get fed up waiting */ ret = comedi_timeout(dev, s, insn, icp_multi_ao_eoc, 0); - if (ret) { - /* Disable interrupt */ - devpriv->IntEnable &= ~ICP_MULTI_INT_DAC_RDY; - writew(devpriv->IntEnable, - dev->mmio + ICP_MULTI_INT_EN); - - /* Clear interrupt status */ - devpriv->IntStatus |= ICP_MULTI_INT_DAC_RDY; - writew(devpriv->IntStatus, - dev->mmio + ICP_MULTI_INT_STAT); - + if (ret) return ret; - } writew(val, dev->mmio + ICP_MULTI_AO); @@ -321,9 +283,9 @@ static int icp_multi_reset(struct comedi_device *dev) struct icp_multi_private *devpriv = dev->private; unsigned int i; - /* Clear INT enables and requests */ + /* Disable all interrupts and clear any requests */ writew(0, dev->mmio + ICP_MULTI_INT_EN); - writew(0x00ff, dev->mmio + ICP_MULTI_INT_STAT); + writew(ICP_MULTI_INT_MASK, dev->mmio + ICP_MULTI_INT_STAT); /* Set DACs to 0..5V range and 0V output */ for (i = 0; i < 4; i++) { -- 2.39.5