From 4ced8c641ef5b0160edfb994c7001e64e4354fe8 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Thu, 23 May 2013 12:58:23 -0700 Subject: [PATCH] staging: comedi: usbduxsigma: tidy up usbdux_pwm_write() Rename the function so it has namespace associated with the driver. Tidy up the comments. Signed-off-by: H Hartley Sweeten Cc: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/usbduxsigma.c | 29 ++++++++++---------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/drivers/staging/comedi/drivers/usbduxsigma.c b/drivers/staging/comedi/drivers/usbduxsigma.c index 83d7b61e1c90..52f75a4b48e1 100644 --- a/drivers/staging/comedi/drivers/usbduxsigma.c +++ b/drivers/staging/comedi/drivers/usbduxsigma.c @@ -1366,24 +1366,25 @@ static int usbdux_pwm_pattern(struct comedi_device *dev, return 1; } -static int usbdux_pwm_write(struct comedi_device *dev, - struct comedi_subdevice *s, - struct comedi_insn *insn, unsigned int *data) +static int usbduxsigma_pwm_write(struct comedi_device *dev, + struct comedi_subdevice *s, + struct comedi_insn *insn, + unsigned int *data) { - 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 - */ + unsigned int chan = CR_CHAN(insn->chanspec); + + /* + * 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 usbduxsigma_pwm_config(struct comedi_device *dev, @@ -1543,7 +1544,7 @@ static int usbduxsigma_attach_common(struct comedi_device *dev) s->subdev_flags = SDF_WRITABLE | SDF_PWM_HBRIDGE; s->n_chan = 8; s->maxdata = devpriv->sizePwmBuf; - s->insn_write = usbdux_pwm_write; + s->insn_write = usbduxsigma_pwm_write; s->insn_config = usbduxsigma_pwm_config; usbdux_pwm_period(dev, s, PWM_DEFAULT_PERIOD); -- 2.30.2