linux.git/drivers/staging/comedi, branch v3.8-rc2

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2012-12-13T20:00:02+00:00

Pull trivial branch from Jiri Kosina:
 "Usual stuff -- comment/printk typo fixes, documentation updates, dead
  code elimination."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
  HOWTO: fix double words typo
  x86 mtrr: fix comment typo in mtrr_bp_init
  propagate name change to comments in kernel source
  doc: Update the name of profiling based on sysfs
  treewide: Fix typos in various drivers
  treewide: Fix typos in various Kconfig
  wireless: mwifiex: Fix typo in wireless/mwifiex driver
  messages: i2o: Fix typo in messages/i2o
  scripts/kernel-doc: check that non-void fcts describe their return value
  Kernel-doc: Convention: Use a "Return" section to describe return values
  radeon: Fix typo and copy/paste error in comments
  doc: Remove unnecessary declarations from Documentation/accounting/getdelays.c
  various: Fix spelling of "asynchronous" in comments.
  Fix misspellings of "whether" in comments.
  eisa: Fix spelling of "asynchronous".
  various: Fix spelling of "registered" in comments.
  doc: fix quite a few typos within Documentation
  target: iscsi: fix comment typos in target/iscsi drivers
  treewide: fix typo of "suport" in various comments and Kconfig
  treewide: fix typo of "suppport" in various comments
  ...

staging: comedi: addi_apci_2032: fix interrupt support

2012-11-30T02:05:31+00:00

This board supports two interrupt sources:

VCC : detects when the external supply voltage drops below 5V
CC  : over temperature diagnostic

Currently the interrupt support is tied into the digital output
subdevice. It's also broken since it does not follow the comedi
API.

Create a new digital input subdevice to handle the interrupts.

Signed-off-by: H Hartley Sweeten 
Cc: Ian Abbott 
Signed-off-by: Greg Kroah-Hartman

staging: comedi: addi_apci_2032: move i_APCI2032_ConfigDigitalOutput()

2012-11-30T02:05:31+00:00

For aesthetic reasons, move this function.

This function has nothing to do with the digital outputs. It's used
to enable the interrupt sources that the board can generate.

Signed-off-by: H Hartley Sweeten 
Cc: Ian Abbott 
Signed-off-by: Greg Kroah-Hartman

staging: comedi: addi_apci_2032: remove the timer s->range_table

2012-11-30T02:05:31+00:00

The timer subdevice does not have a digital range. Its range of
0 to 0xff is the value used to set the reload timer.

Remove the setting of s->range_table. The comedi core will then
set it to range_unknown.

Signed-off-by: H Hartley Sweeten 
Cc: Ian Abbott 
Signed-off-by: Greg Kroah-Hartman

staging: comedi: addi_apci_2032: cleanup the subdevice init

2012-11-30T02:05:31+00:00

For aesthetic reasons, add some whitespace to the subdevice init.

Signed-off-by: H Hartley Sweeten 
Cc: Ian Abbott 
Signed-off-by: Greg Kroah-Hartman

staging: comedi: addi_apci_2032: fix the watchdog timer subdevice

2012-11-30T02:05:31+00:00

The watchdog timer on this board functions exactly like the one on
the apci_1516 board. Fix the i_APCI2032_StartStopWriteWatchdog and
i_APCI2032_ConfigWatchdo functions so that the watchdog follows the
comedi API.

Rename the CamelCase function i_APCI2032_StartStopWriteWatchdog to
apci2032_wdog_insn_writ. This function is used to "ping" the watchdog.

Rename the CamelCase function i_APCI2032_ConfigWatchdog to
apci2032_wdog_insn_config. This function is used to enable/disable
the watchdog and set the timeout.

Signed-off-by: H Hartley Sweeten 
Cc: Ian Abbott 
Signed-off-by: Greg Kroah-Hartman

staging: comedi: addi_apci_2032: remove need for addi-data/addi_common.h

2012-11-30T02:05:31+00:00

Only the ADDIDATA_ENABLE define is used from this header. Just
open-code the value to remove the dependency and remove the include.

Signed-off-by: H Hartley Sweeten 
Cc: Ian Abbott 
Signed-off-by: Greg Kroah-Hartman

staging: comedi: addi_apci_2032: remove use of struct addi_private

2012-11-30T02:05:31+00:00

The only data in addi_private used in this driver is:

tsk_Current - used with send_sig to signal userspace when an interrupt
has occurred. Interrupt support in this driver does not follow the
standard comedi API so this functionality is currently broken. This
will be addressed.

b_OutputMemoryStatus - used in the addi-data "common" code to enable
reading of the eeprom. Eeprom support is not needed by this driver
and has been removed.

Since this data is not needed, remove the use of struct addi_private.

Signed-off-by: H Hartley Sweeten 
Cc: Ian Abbott 
Signed-off-by: Greg Kroah-Hartman

staging: comedi: addi_apci_2032: fix i_APCI2032_ReadWatchdog()

2012-11-30T02:05:30+00:00

This function is used by the watchdog subdevice to read the status of
the watchdog. Rename the CamelCase function to apci2032_wdog_insn_read
and fix the function to return the status value insn->n times like
the comedi core expects.

Signed-off-by: H Hartley Sweeten 
Cc: Ian Abbott 
Signed-off-by: Greg Kroah-Hartman

staging: comedi: addi_apci_2032: cleanup register map defines

2012-11-30T02:05:30+00:00

Cleanup the defines a bit and add the missing information for the
bits in the registers.

Signed-off-by: H Hartley Sweeten 
Cc: Ian Abbott 
Signed-off-by: Greg Kroah-Hartman