Commit 4434a99e authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: addi_apci_3501: rename private data 'b_TimerSelectMode'

Rename this CamelCase member of the private data.
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 a66f2017
...@@ -27,7 +27,7 @@ static int apci3501_config_insn_timer(struct comedi_device *dev, ...@@ -27,7 +27,7 @@ static int apci3501_config_insn_timer(struct comedi_device *dev,
devpriv->tsk_Current = current; devpriv->tsk_Current = current;
if (data[0] == ADDIDATA_WATCHDOG) { if (data[0] == ADDIDATA_WATCHDOG) {
devpriv->b_TimerSelectMode = ADDIDATA_WATCHDOG; devpriv->timer_mode = ADDIDATA_WATCHDOG;
/* Disable the watchdog */ /* Disable the watchdog */
outl(0x0, dev->iobase + APCI3501_TIMER_CTRL_REG); outl(0x0, dev->iobase + APCI3501_TIMER_CTRL_REG);
...@@ -52,7 +52,7 @@ static int apci3501_config_insn_timer(struct comedi_device *dev, ...@@ -52,7 +52,7 @@ static int apci3501_config_insn_timer(struct comedi_device *dev,
ul_Command1 = inl(dev->iobase + APCI3501_TIMER_CTRL_REG); ul_Command1 = inl(dev->iobase + APCI3501_TIMER_CTRL_REG);
ul_Command1 = ul_Command1 & 0xFFFFF9FEUL; ul_Command1 = ul_Command1 & 0xFFFFF9FEUL;
outl(ul_Command1, dev->iobase + APCI3501_TIMER_CTRL_REG); outl(ul_Command1, dev->iobase + APCI3501_TIMER_CTRL_REG);
devpriv->b_TimerSelectMode = ADDIDATA_TIMER; devpriv->timer_mode = ADDIDATA_TIMER;
if (data[1] == 1) { if (data[1] == 1) {
/* Enable TIMER int & DISABLE ALL THE OTHER int SOURCES */ /* Enable TIMER int & DISABLE ALL THE OTHER int SOURCES */
outl(0x02, dev->iobase + APCI3501_TIMER_CTRL_REG); outl(0x02, dev->iobase + APCI3501_TIMER_CTRL_REG);
...@@ -94,7 +94,7 @@ static int apci3501_write_insn_timer(struct comedi_device *dev, ...@@ -94,7 +94,7 @@ static int apci3501_write_insn_timer(struct comedi_device *dev,
struct apci3501_private *devpriv = dev->private; struct apci3501_private *devpriv = dev->private;
unsigned int ul_Command1 = 0; unsigned int ul_Command1 = 0;
if (devpriv->b_TimerSelectMode == ADDIDATA_WATCHDOG) { if (devpriv->timer_mode == ADDIDATA_WATCHDOG) {
if (data[1] == 1) { if (data[1] == 1) {
ul_Command1 = inl(dev->iobase + APCI3501_TIMER_CTRL_REG); ul_Command1 = inl(dev->iobase + APCI3501_TIMER_CTRL_REG);
...@@ -110,7 +110,7 @@ static int apci3501_write_insn_timer(struct comedi_device *dev, ...@@ -110,7 +110,7 @@ static int apci3501_write_insn_timer(struct comedi_device *dev,
} }
} }
if (devpriv->b_TimerSelectMode == ADDIDATA_TIMER) { if (devpriv->timer_mode == ADDIDATA_TIMER) {
if (data[1] == 1) { if (data[1] == 1) {
ul_Command1 = inl(dev->iobase + APCI3501_TIMER_CTRL_REG); ul_Command1 = inl(dev->iobase + APCI3501_TIMER_CTRL_REG);
...@@ -153,18 +153,18 @@ static int apci3501_read_insn_timer(struct comedi_device *dev, ...@@ -153,18 +153,18 @@ static int apci3501_read_insn_timer(struct comedi_device *dev,
{ {
struct apci3501_private *devpriv = dev->private; struct apci3501_private *devpriv = dev->private;
if (devpriv->b_TimerSelectMode == ADDIDATA_WATCHDOG) { if (devpriv->timer_mode == ADDIDATA_WATCHDOG) {
data[0] = inl(dev->iobase + APCI3501_TIMER_STATUS_REG) & 0x1; data[0] = inl(dev->iobase + APCI3501_TIMER_STATUS_REG) & 0x1;
data[1] = inl(dev->iobase + APCI3501_TIMER_SYNC_REG); data[1] = inl(dev->iobase + APCI3501_TIMER_SYNC_REG);
} }
else if (devpriv->b_TimerSelectMode == ADDIDATA_TIMER) { else if (devpriv->timer_mode == ADDIDATA_TIMER) {
data[0] = inl(dev->iobase + APCI3501_TIMER_STATUS_REG) & 0x1; data[0] = inl(dev->iobase + APCI3501_TIMER_STATUS_REG) & 0x1;
data[1] = inl(dev->iobase + APCI3501_TIMER_SYNC_REG); data[1] = inl(dev->iobase + APCI3501_TIMER_SYNC_REG);
} }
else if ((devpriv->b_TimerSelectMode != ADDIDATA_TIMER) else if (devpriv->timer_mode != ADDIDATA_TIMER &&
&& (devpriv->b_TimerSelectMode != ADDIDATA_WATCHDOG)) { devpriv->timer_mode != ADDIDATA_WATCHDOG) {
dev_err(dev->class_dev, "Invalid subdevice.\n"); dev_err(dev->class_dev, "Invalid subdevice.\n");
} }
return insn->n; return insn->n;
......
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
struct apci3501_private { struct apci3501_private {
int i_IobaseAmcc; int i_IobaseAmcc;
struct task_struct *tsk_Current; struct task_struct *tsk_Current;
unsigned char b_TimerSelectMode; unsigned char timer_mode;
}; };
static struct comedi_lrange apci3501_ao_range = { static struct comedi_lrange apci3501_ao_range = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment