staging: comedi: addi_apci_1032: cleanup i_APCI1032_ReadMoreDigitalInput()

Move this function from hwdrv_apci1032.c.

Remove the unnecessary comment and rename the CamelCase function to
apci1032_di_insn_bits().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c
index be35776..3e3c229 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c
@@ -138,36 +138,6 @@ static int i_APCI1032_ConfigDigitalInput(struct comedi_device *dev,
 
 /*
 +----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI1032_ReadMoreDigitalInput                    |
-|                        (struct comedi_device *dev,struct comedi_subdevice *s,               |
-|                     struct comedi_insn *insn,unsigned int *data)                      |
-+----------------------------------------------------------------------------+
-| Task              : Return the status of the Requested digital inputs      |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev      : Driver handle                |
-|                     unsigned int ui_NoOfChannels    : No Of Channels To be Read    |
-|                      unsigned int *data             : Data Pointer to read status  |
-+----------------------------------------------------------------------------+
-| Output Parameters :  --                                                                                                       |
-+----------------------------------------------------------------------------+
-| Return Value      : TRUE  : No error occur                                 |
-|                          : FALSE : Error occur. Return the error          |
-|                                                                               |
-+----------------------------------------------------------------------------+
-*/
-
-static int i_APCI1032_ReadMoreDigitalInput(struct comedi_device *dev,
-                                          struct comedi_subdevice *s,
-                                          struct comedi_insn *insn,
-                                          unsigned int *data)
-{
-       data[1] = inl(dev->iobase + APCI1032_DI_REG);
-
-       return insn->n;
-}
-
-/*
-+----------------------------------------------------------------------------+
 | Function   Name   : static void v_APCI1032_Interrupt                                      |
 |                                        (int irq , void *d)      |
 +----------------------------------------------------------------------------+

diff --git a/drivers/staging/comedi/drivers/addi_apci_1032.c b/drivers/staging/comedi/drivers/addi_apci_1032.c
index 77e78df..9e60d1f 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_1032.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1032.c
@@ -12,6 +12,16 @@ static irqreturn_t v_ADDI_Interrupt(int irq, void *d)
        return IRQ_RETVAL(1);
 }
 
+static int apci1032_di_insn_bits(struct comedi_device *dev,
+                                struct comedi_subdevice *s,
+                                struct comedi_insn *insn,
+                                unsigned int *data)
+{
+       data[1] = inl(dev->iobase + APCI1032_DI_REG);
+
+       return insn->n;
+}
+
 static int apci1032_reset(struct comedi_device *dev)
 {
        /* disable the interrupts */
@@ -74,7 +84,7 @@ static int apci1032_attach_pci(struct comedi_device *dev,
        s->len_chanlist = 32;
        s->range_table  = &range_digital;
        s->insn_config  = i_APCI1032_ConfigDigitalInput;
-       s->insn_bits    = i_APCI1032_ReadMoreDigitalInput;
+       s->insn_bits    = apci1032_di_insn_bits;
 
        /*  Allocate and Initialise DO Subdevice Structures */
        s = &dev->subdevices[3];