diff options
| author | Conrad Meyer <cemeyer@uw.edu> | 2014-03-08 15:47:24 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-08 17:33:07 -0800 |
| commit | f3c25d569045c8e0f274956291b51641241da174 (patch) | |
| tree | 0076bde7248215dc8cc764f919ac0f08cf7847fe /drivers/staging | |
| parent | 11899188beec1fbfb2d212a13475ebfd32cf6a6e (diff) | |
| download | linux-f3c25d569045c8e0f274956291b51641241da174.tar.bz2 | |
Staging: comedi: Fix 80-char line limit style issue in addi_apci_1500.c
Rename some very long functions in addi-data/hwdrv_apci1500.c.
Signed-off-by: Conrad Meyer <cse.cem@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c | 18 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers/addi_apci_1500.c | 4 |
2 files changed, 10 insertions, 12 deletions
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c index 054910511e9e..2628ac44f109 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c @@ -1052,7 +1052,7 @@ static int apci1500_di_insn_bits(struct comedi_device *dev, /* +----------------------------------------------------------------------------+ -| Function Name : int i_APCI1500_ConfigDigitalOutputErrorInterrupt +| Function Name : int i_apci1500_config_output | (struct comedi_device *dev,struct comedi_subdevice *s struct comedi_insn | *insn,unsigned int *data) | | | @@ -1078,10 +1078,9 @@ static int apci1500_di_insn_bits(struct comedi_device *dev, | | +----------------------------------------------------------------------------+ */ -static int i_APCI1500_ConfigDigitalOutputErrorInterrupt(struct comedi_device *dev, - struct comedi_subdevice *s, - struct comedi_insn *insn, - unsigned int *data) +static int i_acpi1500_config_output(struct comedi_device *dev, + struct comedi_subdevice *s, struct comedi_insn *insn, + unsigned int *data) { struct addi_private *devpriv = dev->private; @@ -1879,7 +1878,7 @@ static int i_APCI1500_ConfigCounterTimerWatchdog(struct comedi_device *dev, /* +----------------------------------------------------------------------------+ -| Function Name : int i_APCI1500_StartStopTriggerTimerCounterWatchdog | +| Function Name : int i_apci1500_timer_watchdog | (struct comedi_device *dev,struct comedi_subdevice *s, | struct comedi_insn *insn,unsigned int *data); | +----------------------------------------------------------------------------+ @@ -1905,10 +1904,9 @@ static int i_APCI1500_ConfigCounterTimerWatchdog(struct comedi_device *dev, | | +----------------------------------------------------------------------------+ */ -static int i_APCI1500_StartStopTriggerTimerCounterWatchdog(struct comedi_device *dev, - struct comedi_subdevice *s, - struct comedi_insn *insn, - unsigned int *data) +static int i_apci1500_timer_watchdog(struct comedi_device *dev, + struct comedi_subdevice *s, struct comedi_insn *insn, + unsigned int *data) { struct addi_private *devpriv = dev->private; int i_CommandAndStatusValue; diff --git a/drivers/staging/comedi/drivers/addi_apci_1500.c b/drivers/staging/comedi/drivers/addi_apci_1500.c index 74f7ace8adbc..afa7d6e97a5b 100644 --- a/drivers/staging/comedi/drivers/addi_apci_1500.c +++ b/drivers/staging/comedi/drivers/addi_apci_1500.c @@ -26,11 +26,11 @@ static const struct addi_board apci1500_boardtypes[] = { .di_read = i_APCI1500_Initialisation, .di_write = i_APCI1500_StartStopInputEvent, .di_bits = apci1500_di_insn_bits, - .do_config = i_APCI1500_ConfigDigitalOutputErrorInterrupt, + .do_config = i_acpi1500_config_output, .do_write = i_APCI1500_WriteDigitalOutput, .do_bits = i_APCI1500_ConfigureInterrupt, .timer_config = i_APCI1500_ConfigCounterTimerWatchdog, - .timer_write = i_APCI1500_StartStopTriggerTimerCounterWatchdog, + .timer_write = i_apci1500_timer_watchdog, .timer_read = i_APCI1500_ReadInterruptMask, .timer_bits = i_APCI1500_ReadCounterTimerWatchdog, }, |