diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-06-12 16:04:00 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-17 14:33:37 -0700 |
| commit | 7fd1fd30fd9a12b037045c2e9eba120479e0f329 (patch) | |
| tree | 9e76f5bc3b185bf524eee46428fabc06870ec5fd /drivers/staging/comedi/drivers/addi-data | |
| parent | 588ba6dc5fb4bdca47a3da38c2718fbb82d3eee1 (diff) | |
staging: comedi: addi_apci_3xxx: clean up i_APCI3XXX_Reset()
Rename the CamelCase function and variables.
Remove the extra comments. Leave the main comments to help with further
cleanup of this driver.
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/drivers/addi-data')
| -rw-r--r-- | drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c | 47 |
1 files changed, 7 insertions, 40 deletions
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c index f75ffd929cf3..1549b6adae34 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c @@ -1306,66 +1306,33 @@ static int apci3xxx_do_insn_bits(struct comedi_device *dev, return insn->n; } -/* -+----------------------------------------------------------------------------+ -| Function Name : int i_APCI3XXX_Reset(struct comedi_device *dev) | +----------------------------------------------------------------------------+ -| Task :resets all the registers | -+----------------------------------------------------------------------------+ -| Input Parameters : struct comedi_device *dev | -+----------------------------------------------------------------------------+ -| Output Parameters : - | -+----------------------------------------------------------------------------+ -| Return Value : - | -+----------------------------------------------------------------------------+ -*/ - -static int i_APCI3XXX_Reset(struct comedi_device *dev) +static int apci3xxx_reset(struct comedi_device *dev) { struct addi_private *devpriv = dev->private; - unsigned char b_Cpt = 0; + unsigned int val; + int i; - /*************************/ /* Disable the interrupt */ - /*************************/ - disable_irq(dev->irq); - /****************************/ /* Reset the interrupt flag */ - /****************************/ - devpriv->b_EocEosInterrupt = 0; - /***************************/ /* Clear the start command */ - /***************************/ - writel(0, devpriv->dw_AiBase + 8); - /*****************************/ /* Reset the interrupt flags */ - /*****************************/ - - writel(readl(devpriv->dw_AiBase + 16), devpriv->dw_AiBase + 16); + val = readl(devpriv->dw_AiBase + 16); + writel(val, devpriv->dw_AiBase + 16); - /*****************/ /* clear the EOS */ - /*****************/ - readl(devpriv->dw_AiBase + 20); - /******************/ /* Clear the FIFO */ - /******************/ + for (i = 0; i < 16; i++) + val = readl(devpriv->dw_AiBase + 28); - for (b_Cpt = 0; b_Cpt < 16; b_Cpt++) { - readl(devpriv->dw_AiBase + 28); - } - - /************************/ /* Enable the interrupt */ - /************************/ - enable_irq(dev->irq); return 0; |