staging: comedi: ni_tio: make ni_tio_rinsn() a proper comedi (*insn_read)

Change the parameters to ni_tio_rinsn() to make is a proper comedi
(*insn_read) function. This allows using it directly and removing the
wrapper functions in the ni_660x and ni_mio_common modules.

For aesthetics, rename the function.

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>

diff --git a/drivers/staging/comedi/drivers/ni_660x.c b/drivers/staging/comedi/drivers/ni_660x.c
index f7a95652497dac77bcaa644e67938c8fb9bd4c26..303aa2f0b4bd90379f22fa0e045d13a519a0a7e1 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_660x.c
+++ b/drivers/staging/comedi/drivers/ni_660x.c
@@ -975,15 +975,6 @@ static void ni_660x_free_mite_rings(struct comedi_device *dev)
        }
 }
 
-static int
-ni_660x_GPCT_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
-                  struct comedi_insn *insn, unsigned int *data)
-{
-       struct ni_gpct *counter = s->private;
-
-       return ni_tio_rinsn(counter, insn, data);
-}
-
 static void init_tio_chip(struct comedi_device *dev, int chipset)
 {
        struct ni_660x_private *devpriv = dev->private;
@@ -1241,7 +1232,7 @@ static int ni_660x_auto_attach(struct comedi_device *dev,
                            SDF_CMD_READ /* | SDF_CMD_WRITE */ ;
                        s->n_chan = 3;
                        s->maxdata = 0xffffffff;
-                       s->insn_read = ni_660x_GPCT_rinsn;
+                       s->insn_read = ni_tio_insn_read;
                        s->insn_write = ni_660x_GPCT_winsn;
                        s->insn_config = ni_660x_GPCT_insn_config;
                        s->do_cmd = &ni_660x_cmd;

diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c
index c087f460c02bb410e173d076afddd5f875b72513..cbe40881749fc3007fef09334b062adaba999241 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_mio_common.c
+++ b/drivers/staging/comedi/drivers/ni_mio_common.c
@@ -279,9 +279,6 @@ static int ni_8255_callback(int dir, int port, int data, unsigned long arg);
 static int ni_gpct_insn_write(struct comedi_device *dev,
                              struct comedi_subdevice *s,
                              struct comedi_insn *insn, unsigned int *data);
-static int ni_gpct_insn_read(struct comedi_device *dev,
-                            struct comedi_subdevice *s,
-                            struct comedi_insn *insn, unsigned int *data);
 static int ni_gpct_insn_config(struct comedi_device *dev,
                               struct comedi_subdevice *s,
                               struct comedi_insn *insn, unsigned int *data);
@@ -4445,7 +4442,7 @@ static int ni_E_init(struct comedi_device *dev)
                        s->maxdata = 0xffffffff;
                else
                        s->maxdata = 0xffffff;
-               s->insn_read = &ni_gpct_insn_read;
+               s->insn_read = ni_tio_insn_read;
                s->insn_write = &ni_gpct_insn_write;
                s->insn_config = &ni_gpct_insn_config;
 #ifdef PCIDMA
@@ -5023,14 +5020,6 @@ static int ni_gpct_insn_config(struct comedi_device *dev,
        return ni_tio_insn_config(counter, insn, data);
 }
 
-static int ni_gpct_insn_read(struct comedi_device *dev,
-                            struct comedi_subdevice *s,
-                            struct comedi_insn *insn, unsigned int *data)
-{
-       struct ni_gpct *counter = s->private;
-       return ni_tio_rinsn(counter, insn, data);
-}
-
 static int ni_gpct_insn_write(struct comedi_device *dev,
                              struct comedi_subdevice *s,
                              struct comedi_insn *insn, unsigned int *data)

diff --git a/drivers/staging/comedi/drivers/ni_tio.c b/drivers/staging/comedi/drivers/ni_tio.c
index e00bdda8e698196250f58bbca3e08fb53553f1ec..9d0031dcad2816379c197609f13d069f7273e35f 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_tio.c
+++ b/drivers/staging/comedi/drivers/ni_tio.c
@@ -1579,9 +1579,12 @@ int ni_tio_insn_config(struct ni_gpct *counter,
 }
 EXPORT_SYMBOL_GPL(ni_tio_insn_config);
 
-int ni_tio_rinsn(struct ni_gpct *counter, struct comedi_insn *insn,
-                unsigned int *data)
+int ni_tio_insn_read(struct comedi_device *dev,
+                    struct comedi_subdevice *s,
+                    struct comedi_insn *insn,
+                    unsigned int *data)
 {
+       struct ni_gpct *counter = s->private;
        struct ni_gpct_device *counter_dev = counter->counter_dev;
        const unsigned channel = CR_CHAN(insn->chanspec);
        unsigned cidx = counter->counter_index;
@@ -1621,7 +1624,7 @@ int ni_tio_rinsn(struct ni_gpct *counter, struct comedi_insn *insn,
        }
        return 0;
 }
-EXPORT_SYMBOL_GPL(ni_tio_rinsn);
+EXPORT_SYMBOL_GPL(ni_tio_insn_read);
 
 static unsigned ni_tio_next_load_register(struct ni_gpct *counter)
 {

diff --git a/drivers/staging/comedi/drivers/ni_tio.h b/drivers/staging/comedi/drivers/ni_tio.h
index f4f251db40eda0ae335d13e8fe6a60e97e731f4f..634d746090f94bbada6832482d0b0367eaa071aa 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_tio.h
+++ b/drivers/staging/comedi/drivers/ni_tio.h
@@ -137,7 +137,8 @@ ni_gpct_device_construct(struct comedi_device *,
                         unsigned num_counters);
 void ni_gpct_device_destroy(struct ni_gpct_device *);
 void ni_tio_init_counter(struct ni_gpct *);
-int ni_tio_rinsn(struct ni_gpct *, struct comedi_insn *, unsigned int *data);
+int ni_tio_insn_read(struct comedi_device *, struct comedi_subdevice *,
+                    struct comedi_insn *, unsigned int *data);
 int ni_tio_insn_config(struct ni_gpct *, struct comedi_insn *,
                       unsigned int *data);
 int ni_tio_winsn(struct ni_gpct *, struct comedi_insn *, unsigned int *data);