]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: comedi: usbdux: tidy up usbdux_pwm_write()
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Tue, 30 Jul 2013 00:44:50 +0000 (17:44 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 1 Aug 2013 00:44:54 +0000 (17:44 -0700)
Remove the sanity check of the private data. This function can only be
called if the private data was successfully allocated in the attach.

Tidy up the function a bit.

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/usbdux.c

index 72094d9abba70fb4c8c145d9d3e055cba3c8c7e5..214a49f23ec560b902d030aa71bd43c829324f14 100644 (file)
@@ -1426,27 +1426,23 @@ static int usbdux_pwm_pattern(struct comedi_device *dev,
 
 static int usbdux_pwm_write(struct comedi_device *dev,
                            struct comedi_subdevice *s,
-                           struct comedi_insn *insn, unsigned int *data)
+                           struct comedi_insn *insn,
+                           unsigned int *data)
 {
-       struct usbdux_private *this_usbduxsub = dev->private;
-
-       if (!this_usbduxsub)
-               return -EFAULT;
+       unsigned int chan = CR_CHAN(insn->chanspec);
 
-       if ((insn->n) != 1) {
-               /*
-                * doesn't make sense to have more than one value here because
-                * it would just overwrite the PWM buffer a couple of times
-                */
+       /*
+        * It doesn't make sense to support more than one value here
+        * because it would just overwrite the PWM buffer.
+        */
+       if (insn->n != 1)
                return -EINVAL;
-       }
 
        /*
-        * the sign is set via a special INSN only, this gives us 8 bits for
-        * normal operation
-        * relay sign 0 by default
+        * The sign is set via a special INSN only, this gives us 8 bits
+        * for normal operation, sign is 0 by default.
         */
-       return usbdux_pwm_pattern(dev, s, CR_CHAN(insn->chanspec), data[0], 0);
+       return usbdux_pwm_pattern(dev, s, chan, data[0], 0);
 }
 
 static int usbdux_pwm_read(struct comedi_device *x1,