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

staging: comedi: usbdux: rename dev->private local variables 

For aesthetics, consistently use the same name. 'devpriv', for the
local variable used to reference the private data, 'dev->private'.

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 2015-08-14 15:23:29 -07:00 committed by Greg Kroah-Hartman
parent a0341e5deb
commit 1e4c3a2e7d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -516,7 +516,7 @@ static int usbdux_submit_urbs(struct comedi_device *dev,
static int usbdux_ai_cmdtest(struct comedi_device *dev, static int usbdux_ai_cmdtest(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_cmd *cmd) struct comedi_subdevice *s, struct comedi_cmd *cmd)
{ {
struct usbdux_private *this_usbduxsub = dev->private; struct usbdux_private *devpriv = dev->private;
int err = 0; int err = 0;
/* Step 1 : check if triggers are trivially valid */ /* Step 1 : check if triggers are trivially valid */
@ -552,7 +552,7 @@ static int usbdux_ai_cmdtest(struct comedi_device *dev,
unsigned int arg = 1000000; unsigned int arg = 1000000;
unsigned int min_arg = arg; unsigned int min_arg = arg;
if (this_usbduxsub->high_speed) { if (devpriv->high_speed) {
/* /*
* In high speed mode microframes are possible. * In high speed mode microframes are possible.
* However, during one microframe we can roughly * However, during one microframe we can roughly
@ -877,18 +877,18 @@ static int usbdux_ao_inttrig(struct comedi_device *dev,
static int usbdux_ao_cmdtest(struct comedi_device *dev, static int usbdux_ao_cmdtest(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_cmd *cmd) struct comedi_subdevice *s, struct comedi_cmd *cmd)
{ {
struct usbdux_private *this_usbduxsub = dev->private; struct usbdux_private *devpriv = dev->private;
int err = 0; int err = 0;
unsigned int flags; unsigned int flags;
if (!this_usbduxsub) if (!devpriv)
return -EFAULT; return -EFAULT;
/* Step 1 : check if triggers are trivially valid */ /* Step 1 : check if triggers are trivially valid */
err |= comedi_check_trigger_src(&cmd->start_src, TRIG_NOW | TRIG_INT); err |= comedi_check_trigger_src(&cmd->start_src, TRIG_NOW | TRIG_INT);
if (0) { /* (this_usbduxsub->high_speed) */ if (0) { /* (devpriv->high_speed) */
/* the sampling rate is set by the coversion rate */ /* the sampling rate is set by the coversion rate */
flags = TRIG_FOLLOW; flags = TRIG_FOLLOW;
} else { } else {
@ -897,7 +897,7 @@ static int usbdux_ao_cmdtest(struct comedi_device *dev,
} }
err |= comedi_check_trigger_src(&cmd->scan_begin_src, flags); err |= comedi_check_trigger_src(&cmd->scan_begin_src, flags);
if (0) { /* (this_usbduxsub->high_speed) */ if (0) { /* (devpriv->high_speed) */
/* /*
* in usb-2.0 only one conversion it transmitted * in usb-2.0 only one conversion it transmitted
* but with 8kHz/n * but with 8kHz/n