[PATCH 08/22] staging: comedi: addi_apci_16xx: remove i_APCI16XX_Reset()
H Hartley Sweeten
hsweeten at visionengravers.com
Fri Jan 18 17:43:23 UTC 2013
The 'reset' function for this driver doesn't do anything. Remove
it.
Signed-off-by: H Hartley Sweeten <hsweeten at visionengravers.com>
Cc: Ian Abbott <abbotti at mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
---
.../staging/comedi/drivers/addi-data/hwdrv_apci16xx.c | 18 ------------------
drivers/staging/comedi/drivers/addi_apci_16xx.c | 13 -------------
2 files changed, 31 deletions(-)
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.c
index 5958a9c..e549601 100644
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.c
@@ -787,21 +787,3 @@ static int i_APCI16XX_InsnBitsWriteTTLIO(struct comedi_device *dev,
return i_ReturnValue;
}
-
-/*
-+----------------------------------------------------------------------------+
-| Function Name : int i_APCI2200_Reset(struct comedi_device *dev) | +----------------------------------------------------------------------------+
-| Task :resets all the registers |
-+----------------------------------------------------------------------------+
-| Input Parameters : struct comedi_device *dev |
-+----------------------------------------------------------------------------+
-| Output Parameters : - |
-+----------------------------------------------------------------------------+
-| Return Value : - |
-+----------------------------------------------------------------------------+
-*/
-
-static int i_APCI16XX_Reset(struct comedi_device *dev)
-{
- return 0;
-}
diff --git a/drivers/staging/comedi/drivers/addi_apci_16xx.c b/drivers/staging/comedi/drivers/addi_apci_16xx.c
index 1af5921..e384d4c 100644
--- a/drivers/staging/comedi/drivers/addi_apci_16xx.c
+++ b/drivers/staging/comedi/drivers/addi_apci_16xx.c
@@ -17,7 +17,6 @@ static const struct addi_board apci16xx_boardtypes[] = {
.i_IorangeBase0 = 128,
.i_PCIEeprom = ADDIDATA_NO_EEPROM,
.i_NbrTTLChannel = 48,
- .reset = i_APCI16XX_Reset,
.ttl_config = i_APCI16XX_InsnConfigInitTTLIO,
.ttl_bits = i_APCI16XX_InsnBitsReadTTLIO,
.ttl_read = i_APCI16XX_InsnReadTTLIOAllPortValue,
@@ -29,7 +28,6 @@ static const struct addi_board apci16xx_boardtypes[] = {
.i_IorangeBase0 = 128,
.i_PCIEeprom = ADDIDATA_NO_EEPROM,
.i_NbrTTLChannel = 96,
- .reset = i_APCI16XX_Reset,
.ttl_config = i_APCI16XX_InsnConfigInitTTLIO,
.ttl_bits = i_APCI16XX_InsnBitsReadTTLIO,
.ttl_read = i_APCI16XX_InsnReadTTLIOAllPortValue,
@@ -46,14 +44,6 @@ static irqreturn_t v_ADDI_Interrupt(int irq, void *d)
return IRQ_RETVAL(1);
}
-static int i_ADDI_Reset(struct comedi_device *dev)
-{
- const struct addi_board *this_board = comedi_board(dev);
-
- this_board->reset(dev);
- return 0;
-}
-
static const void *addi_find_boardinfo(struct comedi_device *dev,
struct pci_dev *pcidev)
{
@@ -187,7 +177,6 @@ static int apci16xx_auto_attach(struct comedi_device *dev,
s = &dev->subdevices[6];
s->type = COMEDI_SUBD_UNUSED;
- i_ADDI_Reset(dev);
return 0;
}
@@ -197,8 +186,6 @@ static void apci16xx_detach(struct comedi_device *dev)
struct addi_private *devpriv = dev->private;
if (devpriv) {
- if (dev->iobase)
- i_ADDI_Reset(dev);
if (dev->irq)
free_irq(dev->irq, dev);
if (devpriv->dw_AiBase)
--
1.8.0
More information about the devel
mailing list