staging: comedi: remove unneeded sanity check in insn_bits functions

The comedi core does the sanity check to make sure that the data length
the INSN_BITS instruction is 2. There is no need for the drivers to do
this check. Remove all the sanity checks in the drivers.

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

diff --git a/drivers/staging/comedi/drivers/8255.c b/drivers/staging/comedi/drivers/8255.c
index e0de149c3c29cae82a6ab220cef6f506e1c14c0e..4c9977b8a5ae6bbe6d84493ab264c5107082b3f6 100644 (file)
--- a/drivers/staging/comedi/drivers/8255.c
+++ b/drivers/staging/comedi/drivers/8255.c
@@ -139,9 +139,6 @@ static int subdev_8255_insn(struct comedi_device *dev,
        unsigned int bits;
        unsigned int v;
 
-       if (insn->n != 2)
-               return -EINVAL;
-
        mask = data[0];
        bits = data[1];
 

diff --git a/drivers/staging/comedi/drivers/acl7225b.c b/drivers/staging/comedi/drivers/acl7225b.c
index 0bf552581c5fd584e97fb94f2e4777cbd26fc37d..ab765d3233e21dece0689ee9fc147dd589dd1ade 100644 (file)
--- a/drivers/staging/comedi/drivers/acl7225b.c
+++ b/drivers/staging/comedi/drivers/acl7225b.c
@@ -31,9 +31,6 @@ static int acl7225b_do_insn(struct comedi_device *dev,
                            struct comedi_subdevice *s,
                            struct comedi_insn *insn, unsigned int *data)
 {
-       if (insn->n != 2)
-               return -EINVAL;
-
        if (data[0]) {
                s->state &= ~data[0];
                s->state |= (data[0] & data[1]);
@@ -53,9 +50,6 @@ static int acl7225b_di_insn(struct comedi_device *dev,
                            struct comedi_subdevice *s,
                            struct comedi_insn *insn, unsigned int *data)
 {
-       if (insn->n != 2)
-               return -EINVAL;
-
        data[1] = inb(dev->iobase + (unsigned long)s->private) |
            (inb(dev->iobase + (unsigned long)s->private + 1) << 8);
 

diff --git a/drivers/staging/comedi/drivers/adl_pci6208.c b/drivers/staging/comedi/drivers/adl_pci6208.c
index 98b373063445d13004a1057c0d29fd10b0129d6b..f0a5958d77b697ac3a455f2d3f660b7196769bd7 100644 (file)
--- a/drivers/staging/comedi/drivers/adl_pci6208.c
+++ b/drivers/staging/comedi/drivers/adl_pci6208.c
@@ -141,8 +141,6 @@ static int pci6208_ao_rinsn(struct comedi_device *dev,
  *                                     struct comedi_subdevice *s, */
 /* struct comedi_insn *insn,unsigned int *data) */
 /* { */
-/* if(insn->n!=2)return -EINVAL; */
-
        /* The insn data is a mask in data[0] and the new data
         * in data[1], each channel cooresponding to a bit. */
 /* if(data[0]){ */

diff --git a/drivers/staging/comedi/drivers/adl_pci7230.c b/drivers/staging/comedi/drivers/adl_pci7230.c
index 62fdf7f63703d27199bcee4ce0ce4811b14c9552..d75734a03fb4330f96356339a0e39ce581201be8 100644 (file)
--- a/drivers/staging/comedi/drivers/adl_pci7230.c
+++ b/drivers/staging/comedi/drivers/adl_pci7230.c
@@ -54,9 +54,6 @@ static int adl_pci7230_do_insn_bits(struct comedi_device *dev,
        struct comedi_insn *insn,
        unsigned int *data)
 {
-       if (insn->n != 2)
-               return -EINVAL;
-
        if (data[0]) {
                s->state &= ~data[0];
                s->state |= (data[0] & data[1]);
@@ -72,9 +69,6 @@ static int adl_pci7230_di_insn_bits(struct comedi_device *dev,
        struct comedi_insn *insn,
        unsigned int *data)
 {
-       if (insn->n != 2)
-               return -EINVAL;
-
        data[1] = inl(dev->iobase + PCI7230_DI) & 0xffffffff;
 
        return 2;

diff --git a/drivers/staging/comedi/drivers/adl_pci7432.c b/drivers/staging/comedi/drivers/adl_pci7432.c
index aabf4183aaf5c403a41b373994e667a0c5459ff8..b071a08b615921a4fe31a908a120cb5696b728ef 100644 (file)
--- a/drivers/staging/comedi/drivers/adl_pci7432.c
+++ b/drivers/staging/comedi/drivers/adl_pci7432.c
@@ -57,9 +57,6 @@ static int adl_pci7432_do_insn_bits(struct comedi_device *dev,
        printk(KERN_DEBUG "comedi: pci7432_do_insn_bits called\n");
        printk(KERN_DEBUG "comedi: data0: %8x data1: %8x\n", data[0], data[1]);
 
-       if (insn->n != 2)
-               return -EINVAL;
-
        if (data[0]) {
                s->state &= ~data[0];
                s->state |= (data[0] & data[1]);
@@ -79,9 +76,6 @@ static int adl_pci7432_di_insn_bits(struct comedi_device *dev,
        printk(KERN_DEBUG "comedi: pci7432_di_insn_bits called\n");
        printk(KERN_DEBUG "comedi: data0: %8x data1: %8x\n", data[0], data[1]);
 
-       if (insn->n != 2)
-               return -EINVAL;
-
        data[1] = inl(dev->iobase + PCI7432_DI) & 0xffffffff;
        printk(KERN_DEBUG "comedi: data1 %8x\n", data[1]);
 

diff --git a/drivers/staging/comedi/drivers/aio_iiro_16.c b/drivers/staging/comedi/drivers/aio_iiro_16.c
index 8059cefe5b8c466a955b9ef83c20e30ee561203b..34341078f654de9e184a72f6f0b6029e6e99111c 100644 (file)
--- a/drivers/staging/comedi/drivers/aio_iiro_16.c
+++ b/drivers/staging/comedi/drivers/aio_iiro_16.c
@@ -70,9 +70,6 @@ static int aio_iiro_16_dio_insn_bits_write(struct comedi_device *dev,
                                           struct comedi_insn *insn,
                                           unsigned int *data)
 {
-       if (insn->n != 2)
-               return -EINVAL;
-
        if (data[0]) {
                s->state &= ~data[0];
                s->state |= data[0] & data[1];
@@ -91,9 +88,6 @@ static int aio_iiro_16_dio_insn_bits_read(struct comedi_device *dev,
                                          struct comedi_insn *insn,
                                          unsigned int *data)
 {
-       if (insn->n != 2)
-               return -EINVAL;
-
        data[1] = 0;
        data[1] |= inb(dev->iobase + AIO_IIRO_16_INPUT_0_7);
        data[1] |= inb(dev->iobase + AIO_IIRO_16_INPUT_8_15) << 8;

diff --git a/drivers/staging/comedi/drivers/amplc_pc263.c b/drivers/staging/comedi/drivers/amplc_pc263.c
index 4f15bfd80719e2a6a2249a3f90c12732232ee07b..a018d8176aef7b853693f6ec981c4ff3dcb540ee 100644 (file)
--- a/drivers/staging/comedi/drivers/amplc_pc263.c
+++ b/drivers/staging/comedi/drivers/amplc_pc263.c
@@ -185,9 +185,6 @@ static int pc263_do_insn_bits(struct comedi_device *dev,
                              struct comedi_subdevice *s,
                              struct comedi_insn *insn, unsigned int *data)
 {
-       if (insn->n != 2)
-               return -EINVAL;
-
        /* The insn data is a mask in data[0] and the new data
         * in data[1], each channel cooresponding to a bit. */
        if (data[0]) {

diff --git a/drivers/staging/comedi/drivers/cb_das16_cs.c b/drivers/staging/comedi/drivers/cb_das16_cs.c
index 77dc880ca7869e18642551b8c8fafa754891791e..515dda033e9a86a61dde4e2b1539174beffe2cf2 100644 (file)
--- a/drivers/staging/comedi/drivers/cb_das16_cs.c
+++ b/drivers/staging/comedi/drivers/cb_das16_cs.c
@@ -549,9 +549,6 @@ static int das16cs_dio_insn_bits(struct comedi_device *dev,
                                 struct comedi_subdevice *s,
                                 struct comedi_insn *insn, unsigned int *data)
 {
-       if (insn->n != 2)
-               return -EINVAL;
-
        if (data[0]) {
                s->state &= ~data[0];
                s->state |= data[0] & data[1];

diff --git a/drivers/staging/comedi/drivers/comedi_bond.c b/drivers/staging/comedi/drivers/comedi_bond.c
index 0260ddc0564530cd46c832d7c728a38867fe0514..5ed324c4f6207000ff5df4ae17269869896c8fc2 100644 (file)
--- a/drivers/staging/comedi/drivers/comedi_bond.c
+++ b/drivers/staging/comedi/drivers/comedi_bond.c
@@ -133,8 +133,6 @@ static int bonding_dio_insn_bits(struct comedi_device *dev,
 {
 #define LSAMPL_BITS (sizeof(unsigned int)*8)
        unsigned nchans = LSAMPL_BITS, num_done = 0, i;
-       if (insn->n != 2)
-               return -EINVAL;
 
        if (devpriv->nchans < nchans)
                nchans = devpriv->nchans;

diff --git a/drivers/staging/comedi/drivers/comedi_parport.c b/drivers/staging/comedi/drivers/comedi_parport.c
index 589d12f68067661ad2f9d304d6d4609ec2d93190..10c3c353f967de90670600f435d4bc0563f306df 100644 (file)
--- a/drivers/staging/comedi/drivers/comedi_parport.c
+++ b/drivers/staging/comedi/drivers/comedi_parport.c
@@ -162,9 +162,6 @@ static int parport_intr_insn(struct comedi_device *dev,
                             struct comedi_subdevice *s,
                             struct comedi_insn *insn, unsigned int *data)
 {
-       if (insn->n < 1)
-               return -EINVAL;
-
        data[1] = 0;
        return 2;
 }

diff --git a/drivers/staging/comedi/drivers/contec_pci_dio.c b/drivers/staging/comedi/drivers/contec_pci_dio.c
index d49561ff35baca8fd7af414275e4a3599b44cf86..6aec9a6451b6f4d993181c475e9964d465f69528 100644 (file)
--- a/drivers/staging/comedi/drivers/contec_pci_dio.c
+++ b/drivers/staging/comedi/drivers/contec_pci_dio.c
@@ -74,9 +74,6 @@ static int contec_do_insn_bits(struct comedi_device *dev,
        dev_dbg(dev->class_dev, "contec_do_insn_bits called\n");
        dev_dbg(dev->class_dev, "data: %d %d\n", data[0], data[1]);
 
-       if (insn->n != 2)
-               return -EINVAL;
-
        if (data[0]) {
                s->state &= ~data[0];
                s->state |= data[0] & data[1];
@@ -95,9 +92,6 @@ static int contec_di_insn_bits(struct comedi_device *dev,
        dev_dbg(dev->class_dev, "contec_di_insn_bits called\n");
        dev_dbg(dev->class_dev, "data: %d %d\n", data[0], data[1]);
 
-       if (insn->n != 2)
-               return -EINVAL;
-
        data[1] = inw(dev->iobase + thisboard->in_offs);
 
        return 2;

diff --git a/drivers/staging/comedi/drivers/dmm32at.c b/drivers/staging/comedi/drivers/dmm32at.c
index 2b60cf816b6e36ffff0aa1f17a52cf71d64e2e03..7cc9d20f34821bae5ee82b1f1778a2e11a10dd09 100644 (file)
--- a/drivers/staging/comedi/drivers/dmm32at.c
+++ b/drivers/staging/comedi/drivers/dmm32at.c
@@ -914,9 +914,6 @@ static int dmm32at_dio_insn_bits(struct comedi_device *dev,
 {
        unsigned char diobits;
 
-       if (insn->n != 2)
-               return -EINVAL;
-
        /* The insn data is a mask in data[0] and the new data
         * in data[1], each channel cooresponding to a bit. */
        if (data[0]) {

diff --git a/drivers/staging/comedi/drivers/dt2801.c b/drivers/staging/comedi/drivers/dt2801.c
index 5afbf8a4b030c2817f4a402893d31d30f65676bc..d0bbbbb8816a0388c52aa1f35b81537503ea2d3d 100644 (file)
--- a/drivers/staging/comedi/drivers/dt2801.c
+++ b/drivers/staging/comedi/drivers/dt2801.c
@@ -535,8 +535,6 @@ static int dt2801_dio_insn_bits(struct comedi_device *dev,
        if (s == dev->subdevices + 4)
                which = 1;
 
-       if (insn->n != 2)
-               return -EINVAL;
        if (data[0]) {
                s->state &= ~data[0];
                s->state |= (data[0] & data[1]);

diff --git a/drivers/staging/comedi/drivers/dt2811.c b/drivers/staging/comedi/drivers/dt2811.c
index 91fbf4a7a2afcf65db4e8b107dbceb0787e082dc..b239f381ad5015b8273ac71d9b00567604a8d57a 100644 (file)
--- a/drivers/staging/comedi/drivers/dt2811.c
+++ b/drivers/staging/comedi/drivers/dt2811.c
@@ -352,9 +352,6 @@ static int dt2811_di_insn_bits(struct comedi_device *dev,
                               struct comedi_subdevice *s,
                               struct comedi_insn *insn, unsigned int *data)
 {
-       if (insn->n != 2)
-               return -EINVAL;
-
        data[1] = inb(dev->iobase + DT2811_DIO);
 
        return 2;
@@ -364,9 +361,6 @@ static int dt2811_do_insn_bits(struct comedi_device *dev,
                               struct comedi_subdevice *s,
                               struct comedi_insn *insn, unsigned int *data)
 {
-       if (insn->n != 2)
-               return -EINVAL;
-
        s->state &= ~data[0];
        s->state |= data[0] & data[1];
        outb(s->state, dev->iobase + DT2811_DIO);

diff --git a/drivers/staging/comedi/drivers/dt3000.c b/drivers/staging/comedi/drivers/dt3000.c
index 31a16edc0a27fd4ef220dcb26a694181de59ad7b..6acfe05ac569b13452a20a5ff68c479abdb234ee 100644 (file)
--- a/drivers/staging/comedi/drivers/dt3000.c
+++ b/drivers/staging/comedi/drivers/dt3000.c
@@ -745,9 +745,6 @@ static int dt3k_dio_insn_bits(struct comedi_device *dev,
                              struct comedi_subdevice *s,
                              struct comedi_insn *insn, unsigned int *data)
 {
-       if (insn->n != 2)
-               return -EINVAL;
-
        if (data[0]) {
                s->state &= ~data[0];
                s->state |= data[1] & data[0];

diff --git a/drivers/staging/comedi/drivers/dyna_pci10xx.c b/drivers/staging/comedi/drivers/dyna_pci10xx.c
index 9c855e25275caf07758e642086a16d05a58ebc0e..78f3c8b4a0dc868ff2d42b175f87632af706f96c 100644 (file)
--- a/drivers/staging/comedi/drivers/dyna_pci10xx.c
+++ b/drivers/staging/comedi/drivers/dyna_pci10xx.c
@@ -189,9 +189,6 @@ static int dyna_pci10xx_di_insn_bits(struct comedi_device *dev,
 {
        u16 d = 0;
 
-       if (insn->n != 2)
-               return -EINVAL;
-
        mutex_lock(&devpriv->mutex);
        smp_mb();
        d = inw_p(devpriv->BADR3);
@@ -209,9 +206,6 @@ static int dyna_pci10xx_do_insn_bits(struct comedi_device *dev,
                              struct comedi_subdevice *s,
                              struct comedi_insn *insn, unsigned int *data)
 {
-       if (insn->n != 2)
-               return -EINVAL;
-
        /* The insn data is a mask in data[0] and the new data
         * in data[1], each channel cooresponding to a bit.
         * s->state contains the previous write data

diff --git a/drivers/staging/comedi/drivers/me4000.c b/drivers/staging/comedi/drivers/me4000.c
index 72466bfa3b1d53291072d650a910c77247114972..631b4229201a01d5c8a424b78413a97debeabdd1 100644 (file)
--- a/drivers/staging/comedi/drivers/me4000.c
+++ b/drivers/staging/comedi/drivers/me4000.c
@@ -1643,17 +1643,6 @@ static int me4000_dio_insn_bits(struct comedi_device *dev,
                                struct comedi_subdevice *s,
                                struct comedi_insn *insn, unsigned int *data)
 {
-       /* Length of data must be 2 (mask and new data, see below) */
-       if (insn->n == 0)
-               return 0;
-
-       if (insn->n != 2) {
-               printk
-                   ("comedi%d: me4000: me4000_dio_insn_bits(): "
-                    "Invalid instruction length\n", dev->minor);
-               return -EINVAL;
-       }
-
        /*
         * The insn data consists of a mask in data[0] and the new data
         * in data[1]. The mask defines which bits we are concerning about.

diff --git a/drivers/staging/comedi/drivers/multiq3.c b/drivers/staging/comedi/drivers/multiq3.c
index b1bbd0255fbc213855242291b20a69dd389222b5..d1a8e9129b0fe9fd2e43088ec77da57b69878ae5 100644 (file)
--- a/drivers/staging/comedi/drivers/multiq3.c
+++ b/drivers/staging/comedi/drivers/multiq3.c
@@ -161,9 +161,6 @@ static int multiq3_di_insn_bits(struct comedi_device *dev,
                                struct comedi_subdevice *s,
                                struct comedi_insn *insn, unsigned int *data)
 {
-       if (insn->n != 2)
-               return -EINVAL;
-
        data[1] = inw(dev->iobase + MULTIQ3_DIGIN_PORT);
 
        return 2;
@@ -173,9 +170,6 @@ static int multiq3_do_insn_bits(struct comedi_device *dev,
                                struct comedi_subdevice *s,
                                struct comedi_insn *insn, unsigned int *data)
 {
-       if (insn->n != 2)
-               return -EINVAL;
-
        s->state &= ~data[0];
        s->state |= (data[0] & data[1]);
        outw(s->state, dev->iobase + MULTIQ3_DIGOUT_PORT);

diff --git a/drivers/staging/comedi/drivers/ni_6527.c b/drivers/staging/comedi/drivers/ni_6527.c
index b60ab4848b64279991c2568db4a80ddf7a5a7772..eec44a05af6587ce865ad827aec52394da9af299 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_6527.c
+++ b/drivers/staging/comedi/drivers/ni_6527.c
@@ -174,9 +174,6 @@ static int ni6527_di_insn_bits(struct comedi_device *dev,
                               struct comedi_subdevice *s,
                               struct comedi_insn *insn, unsigned int *data)
 {
-       if (insn->n != 2)
-               return -EINVAL;
-
        data[1] = readb(devpriv->mite->daq_io_addr + Port_Register(0));
        data[1] |= readb(devpriv->mite->daq_io_addr + Port_Register(1)) << 8;
        data[1] |= readb(devpriv->mite->daq_io_addr + Port_Register(2)) << 16;
@@ -188,8 +185,6 @@ static int ni6527_do_insn_bits(struct comedi_device *dev,
                               struct comedi_subdevice *s,
                               struct comedi_insn *insn, unsigned int *data)
 {
-       if (insn->n != 2)
-               return -EINVAL;
        if (data[0]) {
                s->state &= ~data[0];
                s->state |= (data[0] & data[1]);
@@ -339,9 +334,6 @@ static int ni6527_intr_insn_bits(struct comedi_device *dev,
                                 struct comedi_subdevice *s,
                                 struct comedi_insn *insn, unsigned int *data)
 {
-       if (insn->n < 1)
-               return -EINVAL;
-
        data[1] = 0;
        return 2;
 }

diff --git a/drivers/staging/comedi/drivers/ni_65xx.c b/drivers/staging/comedi/drivers/ni_65xx.c
index ac7c74be08a200a4eb2ecbe4c73da4e932caa8d7..f92f8ab3068756d0b90924283c0518c977fbcb62 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_65xx.c
+++ b/drivers/staging/comedi/drivers/ni_65xx.c
@@ -415,8 +415,7 @@ static int ni_65xx_dio_insn_bits(struct comedi_device *dev,
        const unsigned max_ports_per_bitfield = 5;
        unsigned read_bits = 0;
        unsigned j;
-       if (insn->n != 2)
-               return -EINVAL;
+
        base_bitfield_channel = CR_CHAN(insn->chanspec);
        for (j = 0; j < max_ports_per_bitfield; ++j) {
                const unsigned port_offset =
@@ -602,9 +601,6 @@ static int ni_65xx_intr_insn_bits(struct comedi_device *dev,
                                  struct comedi_subdevice *s,
                                  struct comedi_insn *insn, unsigned int *data)
 {
-       if (insn->n < 1)
-               return -EINVAL;
-
        data[1] = 0;
        return 2;
 }

diff --git a/drivers/staging/comedi/drivers/ni_670x.c b/drivers/staging/comedi/drivers/ni_670x.c
index 5dffe6ce47383b56c43adc3e420c3e5592bd2988..b62b4271191e089abfd7051c01dc6b45ea3c2fa8 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_670x.c
+++ b/drivers/staging/comedi/drivers/ni_670x.c
@@ -306,9 +306,6 @@ static int ni_670x_dio_insn_bits(struct comedi_device *dev,
                                 struct comedi_subdevice *s,
                                 struct comedi_insn *insn, unsigned int *data)
 {
-       if (insn->n != 2)
-               return -EINVAL;
-
        /* The insn data is a mask in data[0] and the new data
         * in data[1], each channel cooresponding to a bit. */
        if (data[0]) {

diff --git a/drivers/staging/comedi/drivers/ni_at_ao.c b/drivers/staging/comedi/drivers/ni_at_ao.c
index 1c3f3222d4967886bec2985b4c97c22fd76e3ed9..28848bcc9375ef1419076f8f83581307035ff59b 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_at_ao.c
+++ b/drivers/staging/comedi/drivers/ni_at_ao.c
@@ -239,9 +239,6 @@ static int atao_dio_insn_bits(struct comedi_device *dev,
                              struct comedi_subdevice *s,
                              struct comedi_insn *insn, unsigned int *data)
 {
-       if (insn->n != 2)
-               return -EINVAL;
-
        if (data[0]) {
                s->state &= ~data[0];
                s->state |= data[0] & data[1];

diff --git a/drivers/staging/comedi/drivers/ni_atmio16d.c b/drivers/staging/comedi/drivers/ni_atmio16d.c
index 87992c99d41310561f3786d3f2c8def4e8c2e645..54c039437b0410ca1ab3cbfbbf8661fb9940dced 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_atmio16d.c
+++ b/drivers/staging/comedi/drivers/ni_atmio16d.c
@@ -599,9 +599,6 @@ static int atmio16d_dio_insn_bits(struct comedi_device *dev,
                                  struct comedi_subdevice *s,
                                  struct comedi_insn *insn, unsigned int *data)
 {
-       if (insn->n != 2)
-               return -EINVAL;
-
        if (data[0]) {
                s->state &= ~data[0];
                s->state |= (data[0] | data[1]);

diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c
index 1f796b9361b232daefd62a0f139af7facc5cc832..42df64ec921a1bc32066d6ce558e29d2e78badf0 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_mio_common.c
+++ b/drivers/staging/comedi/drivers/ni_mio_common.c
@@ -3567,8 +3567,7 @@ static int ni_dio_insn_bits(struct comedi_device *dev,
 #ifdef DEBUG_DIO
        printk("ni_dio_insn_bits() mask=0x%x bits=0x%x\n", data[0], data[1]);
 #endif
-       if (insn->n != 2)
-               return -EINVAL;
+
        if (data[0]) {
                /* Perform check to make sure we're not using the
                   serial part of the dio */
@@ -3629,8 +3628,7 @@ static int ni_m_series_dio_insn_bits(struct comedi_device *dev,
        printk("ni_m_series_dio_insn_bits() mask=0x%x bits=0x%x\n", data[0],
               data[1]);
 #endif
-       if (insn->n != 2)
-               return -EINVAL;
+
        if (data[0]) {
                s->state &= ~data[0];
                s->state |= (data[0] & data[1]);
@@ -5485,9 +5483,6 @@ static int ni_rtsi_insn_bits(struct comedi_device *dev,
                             struct comedi_subdevice *s,
                             struct comedi_insn *insn, unsigned int *data)
 {
-       if (insn->n != 2)
-               return -EINVAL;
-
        data[1] = 0;
 
        return 2;

diff --git a/drivers/staging/comedi/drivers/ni_pcidio.c b/drivers/staging/comedi/drivers/ni_pcidio.c
index cba0459651677b2a59b9259aa232114d62575e53..133ab2fd03774321518d77595bee8e3f0f6a4afb 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_pcidio.c
+++ b/drivers/staging/comedi/drivers/ni_pcidio.c
@@ -745,8 +745,6 @@ static int ni_pcidio_insn_bits(struct comedi_device *dev,
                               struct comedi_subdevice *s,
                               struct comedi_insn *insn, unsigned int *data)
 {
-       if (insn->n != 2)
-               return -EINVAL;
        if (data[0]) {
                s->state &= ~data[0];
                s->state |= (data[0] & data[1]);

diff --git a/drivers/staging/comedi/drivers/pcl711.c b/drivers/staging/comedi/drivers/pcl711.c
index d5fa6f28eb1fdb77004d622a4ed8e86176a5dcc0..0df086a1a18d90f12d1c8234088944314abc9ebb 100644 (file)
--- a/drivers/staging/comedi/drivers/pcl711.c
+++ b/drivers/staging/comedi/drivers/pcl711.c
@@ -449,9 +449,6 @@ static int pcl711_di_insn_bits(struct comedi_device *dev,
                               struct comedi_subdevice *s,
                               struct comedi_insn *insn, unsigned int *data)
 {
-       if (insn->n != 2)
-               return -EINVAL;
-
        data[1] = inb(dev->iobase + PCL711_DI_LO) |
            (inb(dev->iobase + PCL711_DI_HI) << 8);
 
@@ -463,9 +460,6 @@ static int pcl711_do_insn_bits(struct comedi_device *dev,
                               struct comedi_subdevice *s,
                               struct comedi_insn *insn, unsigned int *data)
 {
-       if (insn->n != 2)
-               return -EINVAL;
-
        if (data[0]) {
                s->state &= ~data[0];
                s->state |= data[0] & data[1];

diff --git a/drivers/staging/comedi/drivers/pcl725.c b/drivers/staging/comedi/drivers/pcl725.c
index 8edbefd7c43b5d58ac054b8c5a65ca73140556a8..433ea05c3e9191c12cca7637051498b7f3974489 100644 (file)
--- a/drivers/staging/comedi/drivers/pcl725.c
+++ b/drivers/staging/comedi/drivers/pcl725.c
@@ -23,9 +23,6 @@ Devices: [Advantech] PCL-725 (pcl725)
 static int pcl725_do_insn(struct comedi_device *dev, struct comedi_subdevice *s,
                          struct comedi_insn *insn, unsigned int *data)
 {
-       if (insn->n != 2)
-               return -EINVAL;
-
        if (data[0]) {
                s->state &= ~data[0];
                s->state |= (data[0] & data[1]);
@@ -40,9 +37,6 @@ static int pcl725_do_insn(struct comedi_device *dev, struct comedi_subdevice *s,
 static int pcl725_di_insn(struct comedi_device *dev, struct comedi_subdevice *s,
                          struct comedi_insn *insn, unsigned int *data)
 {
-       if (insn->n != 2)
-               return -EINVAL;
-
        data[1] = inb(dev->iobase + PCL725_DI);
 
        return 2;

diff --git a/drivers/staging/comedi/drivers/pcl726.c b/drivers/staging/comedi/drivers/pcl726.c
index b2e73cda2957b27573984e7f9d7c9da434b5ec5e..dfff9af1951bb7d069556209f1f40394e635c495 100644 (file)
--- a/drivers/staging/comedi/drivers/pcl726.c
+++ b/drivers/staging/comedi/drivers/pcl726.c
@@ -197,9 +197,6 @@ static int pcl726_di_insn_bits(struct comedi_device *dev,
 {
        const struct pcl726_board *board = comedi_board(dev);
 
-       if (insn->n != 2)
-               return -EINVAL;
-
        data[1] = inb(dev->iobase + board->di_lo) |
            (inb(dev->iobase + board->di_hi) << 8);
 
@@ -212,9 +209,6 @@ static int pcl726_do_insn_bits(struct comedi_device *dev,
 {
        const struct pcl726_board *board = comedi_board(dev);
 
-       if (insn->n != 2)
-               return -EINVAL;
-
        if (data[0]) {
                s->state &= ~data[0];
                s->state |= data[0] & data[1];

diff --git a/drivers/staging/comedi/drivers/pcl730.c b/drivers/staging/comedi/drivers/pcl730.c
index 3cba79a219b8212248ae121a1158466f53440525..d40caca42862928d81c3017fe9921cb828373b8b 100644 (file)
--- a/drivers/staging/comedi/drivers/pcl730.c
+++ b/drivers/staging/comedi/drivers/pcl730.c
@@ -35,9 +35,6 @@ struct pcl730_board {
 static int pcl730_do_insn(struct comedi_device *dev, struct comedi_subdevice *s,
                          struct comedi_insn *insn, unsigned int *data)
 {
-       if (insn->n != 2)
-               return -EINVAL;
-
        if (data[0]) {
                s->state &= ~data[0];
                s->state |= (data[0] & data[1]);
@@ -57,9 +54,6 @@ static int pcl730_do_insn(struct comedi_device *dev, struct comedi_subdevice *s,
 static int pcl730_di_insn(struct comedi_device *dev, struct comedi_subdevice *s,
                          struct comedi_insn *insn, unsigned int *data)
 {
-       if (insn->n != 2)
-               return -EINVAL;
-
        data[1] = inb(dev->iobase + ((unsigned long)s->private)) |
            (inb(dev->iobase + ((unsigned long)s->private) + 1) << 8);
 

diff --git a/drivers/staging/comedi/drivers/pcl812.c b/drivers/staging/comedi/drivers/pcl812.c
index b0eb2ab89fd80bfe77bf6b13bfd3edf3e6326521..1c146c879be9f106d64f68bf92141eee191f87cb 100644 (file)
--- a/drivers/staging/comedi/drivers/pcl812.c
+++ b/drivers/staging/comedi/drivers/pcl812.c
@@ -501,9 +501,6 @@ static int pcl812_di_insn_bits(struct comedi_device *dev,
                               struct comedi_subdevice *s,
                               struct comedi_insn *insn, unsigned int *data)
 {
-       if (insn->n != 2)
-               return -EINVAL;
-
        data[1] = inb(dev->iobase + PCL812_DI_LO);
        data[1] |= inb(dev->iobase + PCL812_DI_HI) << 8;
 
@@ -517,9 +514,6 @@ static int pcl812_do_insn_bits(struct comedi_device *dev,
                               struct comedi_subdevice *s,
                               struct comedi_insn *insn, unsigned int *data)
 {
-       if (insn->n != 2)
-               return -EINVAL;
-
        if (data[0]) {
                s->state &= ~data[0];
                s->state |= data[0] & data[1];

diff --git a/drivers/staging/comedi/drivers/pcl818.c b/drivers/staging/comedi/drivers/pcl818.c
index 23b61d8aa404fee1c1a273f9e07083c7287090ad..13eaadfbaaabb751e9e90a04a700453d7a18c620 100644 (file)
--- a/drivers/staging/comedi/drivers/pcl818.c
+++ b/drivers/staging/comedi/drivers/pcl818.c
@@ -442,9 +442,6 @@ static int pcl818_di_insn_bits(struct comedi_device *dev,
                               struct comedi_subdevice *s,
                               struct comedi_insn *insn, unsigned int *data)
 {
-       if (insn->n != 2)
-               return -EINVAL;
-
        data[1] = inb(dev->iobase + PCL818_DI_LO) |
            (inb(dev->iobase + PCL818_DI_HI) << 8);
 
@@ -461,9 +458,6 @@ static int pcl818_do_insn_bits(struct comedi_device *dev,
                               struct comedi_subdevice *s,
                               struct comedi_insn *insn, unsigned int *data)
 {
-       if (insn->n != 2)
-               return -EINVAL;
-
        s->state &= ~data[0];
        s->state |= (data[0] & data[1]);
 

diff --git a/drivers/staging/comedi/drivers/pcm3730.c b/drivers/staging/comedi/drivers/pcm3730.c
index b48f7aa7520bcb95377011a024a9f02a4146ce6a..311fe2dc5386eb93ac38c1a2c0da238a6eb979fc 100644 (file)
--- a/drivers/staging/comedi/drivers/pcm3730.c
+++ b/drivers/staging/comedi/drivers/pcm3730.c
@@ -32,8 +32,6 @@ static int pcm3730_do_insn_bits(struct comedi_device *dev,
                                struct comedi_subdevice *s,
                                struct comedi_insn *insn, unsigned int *data)
 {
-       if (insn->n != 2)
-               return -EINVAL;
        if (data[0]) {
                s->state &= ~data[0];
                s->state |= (data[0] & data[1]);
@@ -48,8 +46,6 @@ static int pcm3730_di_insn_bits(struct comedi_device *dev,
                                struct comedi_subdevice *s,
                                struct comedi_insn *insn, unsigned int *data)
 {
-       if (insn->n != 2)
-               return -EINVAL;
        data[1] = inb(dev->iobase + (unsigned long)(s->private));
        return 2;
 }

diff --git a/drivers/staging/comedi/drivers/pcmmio.c b/drivers/staging/comedi/drivers/pcmmio.c
index 0e64d848a2a887956532f9cfc7ed1488a58dd615..a918cc087708f52bcab6231265e3b0b6c7f3bd30 100644 (file)
--- a/drivers/staging/comedi/drivers/pcmmio.c
+++ b/drivers/staging/comedi/drivers/pcmmio.c
@@ -275,8 +275,6 @@ static int pcmmio_dio_insn_bits(struct comedi_device *dev,
                                struct comedi_insn *insn, unsigned int *data)
 {
        int byte_no;
-       if (insn->n != 2)
-               return -EINVAL;
 
        /* NOTE:
           reading a 0 means this channel was high

diff --git a/drivers/staging/comedi/drivers/pcmuio.c b/drivers/staging/comedi/drivers/pcmuio.c
index 4426e1798ed56941a20140cc5555631b120e85e2..33f740ee35245779bfbeb3005adb98dc87de30b3 100644 (file)
--- a/drivers/staging/comedi/drivers/pcmuio.c
+++ b/drivers/staging/comedi/drivers/pcmuio.c
@@ -211,8 +211,6 @@ static int pcmuio_dio_insn_bits(struct comedi_device *dev,
                                struct comedi_insn *insn, unsigned int *data)
 {
        int byte_no;
-       if (insn->n != 2)
-               return -EINVAL;
 
        /* NOTE:
           reading a 0 means this channel was high

diff --git a/drivers/staging/comedi/drivers/poc.c b/drivers/staging/comedi/drivers/poc.c
index a129ccace93d187411167bd48e2a7728db19d7f1..a655b906164a54bb8a2fdc64bb4d47d025aebc46 100644 (file)
--- a/drivers/staging/comedi/drivers/poc.c
+++ b/drivers/staging/comedi/drivers/poc.c
@@ -99,9 +99,6 @@ static int pcl733_insn_bits(struct comedi_device *dev,
                            struct comedi_subdevice *s,
                            struct comedi_insn *insn, unsigned int *data)
 {
-       if (insn->n != 2)
-               return -EINVAL;
-
        data[1] = inb(dev->iobase + 0);
        data[1] |= (inb(dev->iobase + 1) << 8);
        data[1] |= (inb(dev->iobase + 2) << 16);
@@ -114,8 +111,6 @@ static int pcl734_insn_bits(struct comedi_device *dev,
                            struct comedi_subdevice *s,
                            struct comedi_insn *insn, unsigned int *data)
 {
-       if (insn->n != 2)
-               return -EINVAL;
        if (data[0]) {
                s->state &= ~data[0];
                s->state |= (data[0] & data[1]);

diff --git a/drivers/staging/comedi/drivers/rtd520.c b/drivers/staging/comedi/drivers/rtd520.c
index c3c8097acd0262a534c4599d51eb92a685dd9558..6ff1fa0fd5de2ce1767950e537ef54a76c5c623c 100644 (file)
--- a/drivers/staging/comedi/drivers/rtd520.c
+++ b/drivers/staging/comedi/drivers/rtd520.c
@@ -1811,9 +1811,6 @@ static int rtd_dio_insn_bits(struct comedi_device *dev,
                             struct comedi_subdevice *s,
                             struct comedi_insn *insn, unsigned int *data)
 {
-       if (insn->n != 2)
-               return -EINVAL;
-
        /* The insn data is a mask in data[0] and the new data
         * in data[1], each channel cooresponding to a bit. */
        if (data[0]) {

diff --git a/drivers/staging/comedi/drivers/rti800.c b/drivers/staging/comedi/drivers/rti800.c
index 966ac2ccc87728375f5c68877dd4eeaf552890a6..b6f219922a018bea8d36ad6d62598659853a6d8e 100644 (file)
--- a/drivers/staging/comedi/drivers/rti800.c
+++ b/drivers/staging/comedi/drivers/rti800.c
@@ -263,8 +263,6 @@ static int rti800_di_insn_bits(struct comedi_device *dev,
                               struct comedi_subdevice *s,
                               struct comedi_insn *insn, unsigned int *data)
 {
-       if (insn->n != 2)
-               return -EINVAL;
        data[1] = inb(dev->iobase + RTI800_DI);
        return 2;
 }
@@ -273,9 +271,6 @@ static int rti800_do_insn_bits(struct comedi_device *dev,
                               struct comedi_subdevice *s,
                               struct comedi_insn *insn, unsigned int *data)
 {
-       if (insn->n != 2)
-               return -EINVAL;
-
        if (data[0]) {
                s->state &= ~data[0];
                s->state |= data[0] & data[1];

diff --git a/drivers/staging/comedi/drivers/s526.c b/drivers/staging/comedi/drivers/s526.c
index 141bc9e881c9816e06a73a79b886b838cbb1e83b..b1dd22423704d28b344b6b5f636f613a0872441d 100644 (file)
--- a/drivers/staging/comedi/drivers/s526.c
+++ b/drivers/staging/comedi/drivers/s526.c
@@ -678,9 +678,6 @@ static int s526_dio_insn_bits(struct comedi_device *dev,
                              struct comedi_subdevice *s,
                              struct comedi_insn *insn, unsigned int *data)
 {
-       if (insn->n != 2)
-               return -EINVAL;
-
        /* The insn data is a mask in data[0] and the new data
         * in data[1], each channel cooresponding to a bit. */
        if (data[0]) {

diff --git a/drivers/staging/comedi/drivers/s626.c b/drivers/staging/comedi/drivers/s626.c
index 32e03bc247b3cabd3f453ee9f4396554e7223ab9..182074c5f78b8db8e02bbc1a4185e8dc2bcf47ed 100644 (file)
--- a/drivers/staging/comedi/drivers/s626.c
+++ b/drivers/staging/comedi/drivers/s626.c
@@ -2140,18 +2140,6 @@ static int s626_dio_insn_bits(struct comedi_device *dev,
                              struct comedi_subdevice *s,
                              struct comedi_insn *insn, unsigned int *data)
 {
-
-       /* Length of data must be 2 (mask and new data, see below) */
-       if (insn->n == 0)
-               return 0;
-
-       if (insn->n != 2) {
-               printk
-                   ("comedi%d: s626: s626_dio_insn_bits(): Invalid instruction length\n",
-                    dev->minor);
-               return -EINVAL;
-       }
-
        /*
         * The insn data consists of a mask in data[0] and the new data in
         * data[1]. The mask defines which bits we are concerning about.

diff --git a/drivers/staging/comedi/drivers/skel.c b/drivers/staging/comedi/drivers/skel.c
index 92d44c1d258741369613b4cb4a3a550ef9e068a2..67207de33906fd331674741b6a5bb41bf0d1e0d6 100644 (file)
--- a/drivers/staging/comedi/drivers/skel.c
+++ b/drivers/staging/comedi/drivers/skel.c
@@ -561,9 +561,6 @@ static int skel_dio_insn_bits(struct comedi_device *dev,
                              struct comedi_subdevice *s,
                              struct comedi_insn *insn, unsigned int *data)
 {
-       if (insn->n != 2)
-               return -EINVAL;
-
        /* The insn data is a mask in data[0] and the new data
         * in data[1], each channel cooresponding to a bit. */
        if (data[0]) {

diff --git a/drivers/staging/comedi/drivers/ssv_dnp.c b/drivers/staging/comedi/drivers/ssv_dnp.c
index b12bafe9baf6485a5cfbe64ca821daca68127831..f7bf3a2b9f31aaf0b99f54bff00145d9d95dbd8d 100644 (file)
--- a/drivers/staging/comedi/drivers/ssv_dnp.c
+++ b/drivers/staging/comedi/drivers/ssv_dnp.c
@@ -77,10 +77,6 @@ static int dnp_dio_insn_bits(struct comedi_device *dev,
                             struct comedi_subdevice *s,
                             struct comedi_insn *insn, unsigned int *data)
 {
-
-       if (insn->n != 2)
-               return -EINVAL; /* insn uses data[0] and data[1]     */
-
        /* The insn data is a mask in data[0] and the new data in data[1],   */
        /* each channel cooresponding to a bit.                              */
 

diff --git a/drivers/staging/comedi/drivers/usbdux.c b/drivers/staging/comedi/drivers/usbdux.c
index 0386fd4a80bad072ecdaebc3e124972565a1e373..3185e1cdfb2919ab3ccd42c48623d6bb27bd04ea 100644 (file)
--- a/drivers/staging/comedi/drivers/usbdux.c
+++ b/drivers/staging/comedi/drivers/usbdux.c
@@ -1780,9 +1780,6 @@ static int usbdux_dio_insn_bits(struct comedi_device *dev,
        if (!this_usbduxsub)
                return -EFAULT;
 
-       if (insn->n != 2)
-               return -EINVAL;
-
        down(&this_usbduxsub->sem);
 
        if (!(this_usbduxsub->probed)) {

diff --git a/drivers/staging/comedi/drivers/usbduxsigma.c b/drivers/staging/comedi/drivers/usbduxsigma.c
index 699deb16fa3810bdffc01b30199a85807f7864a3..a93cc5df2093cf81ad1a4b049d024bc078c095fc 100644 (file)
--- a/drivers/staging/comedi/drivers/usbduxsigma.c
+++ b/drivers/staging/comedi/drivers/usbduxsigma.c
@@ -1845,9 +1845,6 @@ static int usbdux_dio_insn_bits(struct comedi_device *dev,
        if (!this_usbduxsub)
                return -EFAULT;
 
-       if (insn->n != 2)
-               return -EINVAL;
-
        down(&this_usbduxsub->sem);
 
        if (!(this_usbduxsub->probed)) {