Skip to content

Commit

Permalink
staging: comedi: addi_apci_2200: absorb i_APCI2200_Reset()
Browse files Browse the repository at this point in the history 
This is the only 'reset' function used by the driver, remove it
from the boardinfo and absorb the code from hwdrv_apci2200.c into
the driver.

Rename the CamelCase function i_ADDI_Reset() to apci2200_reset().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Jan 18, 2013
1 parent df9f604 commit fb1e4e2
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 38 deletions.
32 changes: 0 additions & 32 deletions drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -229,35 +229,3 @@ static int i_APCI2200_ReadWatchdog(struct comedi_device *dev,
APCI2200_WATCHDOG_STATUS) & 0x1;
return insn->n;
}

/*
+----------------------------------------------------------------------------+
| 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_APCI2200_Reset(struct comedi_device *dev)
{
struct addi_private *devpriv = dev->private;

outw(0x0, devpriv->iobase + APCI2200_DIGITAL_OP); /* RESETS THE DIGITAL OUTPUTS */
outw(0x0,
devpriv->iobase + APCI2200_WATCHDOG +
APCI2200_WATCHDOG_ENABLEDISABLE);
outw(0x0,
devpriv->iobase + APCI2200_WATCHDOG +
APCI2200_WATCHDOG_RELOAD_VALUE);
outw(0x0,
devpriv->iobase + APCI2200_WATCHDOG +
APCI2200_WATCHDOG_RELOAD_VALUE + 2);
return 0;
}
18 changes: 12 additions & 6 deletions drivers/staging/comedi/drivers/addi_apci_2200.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ static const struct addi_board apci2200_boardtypes[] = {
.i_NbrDiChannel = 8,
.i_NbrDoChannel = 16,
.i_Timer = 1,
.reset = i_APCI2200_Reset,
.di_bits = apci2200_di_insn_bits,
.do_bits = apci2200_do_insn_bits,
.timer_config = i_APCI2200_ConfigWatchdog,
Expand All @@ -35,11 +34,18 @@ static irqreturn_t v_ADDI_Interrupt(int irq, void *d)
return IRQ_RETVAL(1);
}

static int i_ADDI_Reset(struct comedi_device *dev)
static int apci2200_reset(struct comedi_device *dev)
{
const struct addi_board *this_board = comedi_board(dev);
struct addi_private *devpriv = dev->private;

outw(0x0, devpriv->iobase + APCI2200_DIGITAL_OP);
outw(0x0, devpriv->iobase + APCI2200_WATCHDOG +
APCI2200_WATCHDOG_ENABLEDISABLE);
outw(0x0, devpriv->iobase + APCI2200_WATCHDOG +
APCI2200_WATCHDOG_RELOAD_VALUE);
outw(0x0, devpriv->iobase + APCI2200_WATCHDOG +
APCI2200_WATCHDOG_RELOAD_VALUE + 2);

this_board->reset(dev);
return 0;
}

Expand Down Expand Up @@ -207,7 +213,7 @@ static int apci2200_auto_attach(struct comedi_device *dev,
s = &dev->subdevices[6];
s->type = COMEDI_SUBD_UNUSED;

i_ADDI_Reset(dev);
apci2200_reset(dev);
return 0;
}

Expand All @@ -218,7 +224,7 @@ static void apci2200_detach(struct comedi_device *dev)

if (devpriv) {
if (dev->iobase)
i_ADDI_Reset(dev);
apci2200_reset(dev);
if (dev->irq)
free_irq(dev->irq, dev);
if (devpriv->dw_AiBase)
Expand Down

0 comments on commit fb1e4e2

Please sign in to comment.