]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
staging: comedi: cb_pcidas: remove unnecessary check in caldac_8800_write()
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Thu, 20 Nov 2014 22:07:23 +0000 (15:07 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 26 Nov 2014 23:39:16 +0000 (15:39 -0800)
The 'address' passed to this function is actually the comedi channel. This
value will always be less than the subdevice n_chan (which is 8). Remove
the unnecessary sanity check in caldac_8800_write().

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>
drivers/staging/comedi/drivers/cb_pcidas.c

index 35c63059df4beee92c8235a29fee8a39d4f722d4..1296ccd8a798d00241bb1e2d30d4b57897b965d8 100644 (file)
@@ -596,16 +596,10 @@ static int caldac_8800_write(struct comedi_device *dev, unsigned int address,
                             uint8_t value)
 {
        struct cb_pcidas_private *devpriv = dev->private;
-       static const int num_caldac_channels = 8;
        static const int bitstream_length = 11;
        unsigned int bitstream = ((address & 0x7) << 8) | value;
        static const int caldac_8800_udelay = 1;
 
-       if (address >= num_caldac_channels) {
-               dev_err(dev->class_dev, "illegal caldac channel\n");
-               return -1;
-       }
-
        if (value == devpriv->caldac_value[address])
                return 1;