Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89878614 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: usbdux: return void from usbdux_pwm_pattern() 



This function never fails and currently returns '1' so that the
usbdux_pwm_write() function returns to proper value (insn->n).

It's also called by usbdux_pwm_config() which also returns the '1'
value. The proper return code for this function should be '0' to
indicate success.

Change the return type of the function to void and just have the
callers return the proper values.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 893a2778

drivers/staging/comedi/drivers/usbdux.c

+10 −9
Original line number Diff line number Diff line
@@ -1396,7 +1396,7 @@ static int usbdux_pwm_start(struct comedi_device *dev, 
	return ret;

}



static int usbdux_pwm_pattern(struct comedi_device *dev,

static void usbdux_pwm_pattern(struct comedi_device *dev,

			       struct comedi_subdevice *s,

			       unsigned int chan,

			       unsigned int value,
@@ -1421,7 +1421,6 @@ static int usbdux_pwm_pattern(struct comedi_device *dev, 
			c |= sgn_mask;

		*buf++ = c;

	}

	return 1;

}



static int usbdux_pwm_write(struct comedi_device *dev,
@@ -1442,7 +1441,9 @@ static int usbdux_pwm_write(struct comedi_device *dev, 
	 * 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, chan, data[0], 0);

	usbdux_pwm_pattern(dev, s, chan, data[0], 0);



	return insn->n;

}



static int usbdux_pwm_config(struct comedi_device *dev,
@@ -1477,8 +1478,8 @@ static int usbdux_pwm_config(struct comedi_device *dev, 
		 * data[1] = value

		 * data[2] = sign (for a relay)

		 */

		return usbdux_pwm_pattern(dev, s, chan,

					  data[1], (data[2] != 0));

		usbdux_pwm_pattern(dev, s, chan, data[1], (data[2] != 0));

		return 0;

	case INSN_CONFIG_PWM_GET_H_BRIDGE:

		/* values are not kept in this driver, nothing to return here */

		return -EINVAL;