From: H Hartley Sweeten Date: Thu, 20 Nov 2014 22:07:23 +0000 (-0700) Subject: staging: comedi: cb_pcidas: remove unnecessary check in caldac_8800_write() X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=06b66dc22b83fd3d9e4de42011dc5de04a226971;p=linux-beck.git staging: comedi: cb_pcidas: remove unnecessary check in caldac_8800_write() 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 Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/cb_pcidas.c b/drivers/staging/comedi/drivers/cb_pcidas.c index 35c63059df4b..1296ccd8a798 100644 --- a/drivers/staging/comedi/drivers/cb_pcidas.c +++ b/drivers/staging/comedi/drivers/cb_pcidas.c @@ -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;