diff options
| author | H Hartley Sweeten <[email protected]> | 2015-08-12 13:25:37 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2015-08-14 18:36:17 -0700 |
| commit | 4434a99eaab2cb3b214201d05f396c940033a6fe (patch) | |
| tree | 3ceafb5779cc7cec80406eb15b4a686365de416e | |
| parent | a66f2017ec2daebfef9e7cdf4edeca7a362c7303 (diff) | |
staging: comedi: addi_apci_3501: rename private data 'b_TimerSelectMode'
Rename this CamelCase member of the private data.
Signed-off-by: H Hartley Sweeten <[email protected]>
Reviewed-by: Ian Abbott <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
| -rw-r--r-- | drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c | 16 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers/addi_apci_3501.c | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c index e12b2bc61ca3..33fcd19b0a75 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c @@ -27,7 +27,7 @@ static int apci3501_config_insn_timer(struct comedi_device *dev, devpriv->tsk_Current = current; if (data[0] == ADDIDATA_WATCHDOG) { - devpriv->b_TimerSelectMode = ADDIDATA_WATCHDOG; + devpriv->timer_mode = ADDIDATA_WATCHDOG; /* Disable the watchdog */ outl(0x0, dev->iobase + APCI3501_TIMER_CTRL_REG); @@ -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 = ul_Command1 & 0xFFFFF9FEUL; outl(ul_Command1, dev->iobase + APCI3501_TIMER_CTRL_REG); - devpriv->b_TimerSelectMode = ADDIDATA_TIMER; + devpriv->timer_mode = ADDIDATA_TIMER; if (data[1] == 1) { /* Enable TIMER int & DISABLE ALL THE OTHER int SOURCES */ outl(0x02, dev->iobase + APCI3501_TIMER_CTRL_REG); @@ -94,7 +94,7 @@ static int apci3501_write_insn_timer(struct comedi_device *dev, struct apci3501_private *devpriv = dev->private; unsigned int ul_Command1 = 0; - if (devpriv->b_TimerSelectMode == ADDIDATA_WATCHDOG) { + if (devpriv->timer_mode == ADDIDATA_WATCHDOG) { if (data[1] == 1) { ul_Command1 = inl(dev->iobase + APCI3501_TIMER_CTRL_REG); @@ -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) { ul_Command1 = inl(dev->iobase + APCI3501_TIMER_CTRL_REG); @@ -153,18 +153,18 @@ static int apci3501_read_insn_timer(struct comedi_device *dev, { 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[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[1] = inl(dev->iobase + APCI3501_TIMER_SYNC_REG); } - else if ((devpriv->b_TimerSelectMode != ADDIDATA_TIMER) - && (devpriv->b_TimerSelectMode != ADDIDATA_WATCHDOG)) { + else if (devpriv->timer_mode != ADDIDATA_TIMER && + devpriv->timer_mode != ADDIDATA_WATCHDOG) { dev_err(dev->class_dev, "Invalid subdevice.\n"); } return insn->n; diff --git a/drivers/staging/comedi/drivers/addi_apci_3501.c b/drivers/staging/comedi/drivers/addi_apci_3501.c index 73786a3f3df9..6dd7e3d22dc5 100644 --- a/drivers/staging/comedi/drivers/addi_apci_3501.c +++ b/drivers/staging/comedi/drivers/addi_apci_3501.c @@ -74,7 +74,7 @@ struct apci3501_private { int i_IobaseAmcc; struct task_struct *tsk_Current; - unsigned char b_TimerSelectMode; + unsigned char timer_mode; }; static struct comedi_lrange apci3501_ao_range = { |