openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: comedi: usbdux: tidy up usbdux_pwm_config() 

Rename the local variable used for the private data pointer to 'devpriv'.

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>
This commit is contained in:
H Hartley Sweeten 2013-07-29 17:45:28 -07:00 committed by Greg Kroah-Hartman
parent 64ffc665d7
commit 893a27785c
1 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/staging/comedi/drivers/usbdux.c
View File

@ -1445,15 +1445,16 @@ static int usbdux_pwm_write(struct comedi_device *dev,
return usbdux_pwm_pattern(dev, s, chan, data[0], 0); return usbdux_pwm_pattern(dev, s, chan, data[0], 0);
} }
/* switches on/off PWM */
static int usbdux_pwm_config(struct comedi_device *dev, static int usbdux_pwm_config(struct comedi_device *dev,
struct comedi_subdevice *s, 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; struct usbdux_private *devpriv = dev->private;
unsigned int chan = CR_CHAN(insn->chanspec);
switch (data[0]) { switch (data[0]) {
case INSN_CONFIG_ARM: case INSN_CONFIG_ARM:
/* switch it on */
/* /*
* if not zero the PWM is limited to a certain time which is * if not zero the PWM is limited to a certain time which is
* not supported here * not supported here
@ -1464,27 +1465,20 @@ static int usbdux_pwm_config(struct comedi_device *dev,
case INSN_CONFIG_DISARM: case INSN_CONFIG_DISARM:
return usbdux_pwm_cancel(dev, s); return usbdux_pwm_cancel(dev, s);
case INSN_CONFIG_GET_PWM_STATUS: case INSN_CONFIG_GET_PWM_STATUS:
/* data[1] = devpriv->pwm_cmd_running;
* to check if the USB transmission has failed or in case PWM
* was limited to n cycles to check if it has terminated
*/
data[1] = this_usbduxsub->pwm_cmd_running;
return 0; return 0;
case INSN_CONFIG_PWM_SET_PERIOD: case INSN_CONFIG_PWM_SET_PERIOD:
return usbdux_pwm_period(dev, s, data[1]); return usbdux_pwm_period(dev, s, data[1]);
case INSN_CONFIG_PWM_GET_PERIOD: case INSN_CONFIG_PWM_GET_PERIOD:
data[1] = this_usbduxsub->pwm_period; data[1] = devpriv->pwm_period;
return 0; return 0;
case INSN_CONFIG_PWM_SET_H_BRIDGE: case INSN_CONFIG_PWM_SET_H_BRIDGE:
/* value in the first byte and the sign in the second for a /*
relay */ * data[1] = value
return usbdux_pwm_pattern(dev, s, * data[2] = sign (for a relay)
/* the channel number */ */
CR_CHAN(insn->chanspec), return usbdux_pwm_pattern(dev, s, chan,
/* actual PWM data */ data[1], (data[2] != 0));
data[1],
/* just a sign */
(data[2] != 0));
case INSN_CONFIG_PWM_GET_H_BRIDGE: case INSN_CONFIG_PWM_GET_H_BRIDGE:
/* values are not kept in this driver, nothing to return here */ /* values are not kept in this driver, nothing to return here */
return -EINVAL; return -EINVAL;