summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-03-17staging: comedi: gsc_hpdi: remove pr_fmt() defineH Hartley Sweeten
This driver no longer has any pr_{level} messages. Remove the pr_fmt(). 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>
2014-03-17staging: comedi: gsc_hpdi: convert comedi_error() messages to dev_err()H Hartley Sweeten
For aesthetics, convert the comedi_error() messages to dev_err(). 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>
2014-03-17staging: comedi: gsc_hpdi: tidy up the boardinfoH Hartley Sweeten
Remove the unnecessary comments in the boardinfo definition and tidy up the declaration. FWIW, I'm not sure this boardinfo is really needed... 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>
2014-03-17staging: comedi: gsc_hpdi: tidy up the register mapH Hartley Sweeten
For aesthetics, convert the various enums into simple defines to describe the register map for the board. Group the bit defines with the associated register define. Convert the helper functions for the register bit/shift/mask stuff into simple defines. 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>
2014-03-17staging: comedi: gsc_hpdi: rename 'hpdi_iobase' in private dataH Hartley Sweeten
This member in the private data holds the ioremaped PCI BAR2 address which is the primary base address for the boards registers. For aesthetics, rename this member simply 'mmio'. 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>
2014-03-17staging: comedi: gsc_hpdi: rename 'plx9080_iobase' in private dataH Hartley Sweeten
Rename this member to fix two checkpatch.pl warnings about lines > 80 characters. Also remove the unnecessary comment. 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>
2014-03-17staging: comedi: gsc_hpdi: tidy up gsc_hpdi_drain_dma()H Hartley Sweeten
Refactor this function to clarify the loop that reads all the full buffers. 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>
2014-03-17staging: comedi: gsc_hpdi: remove 'volatile' from the private data membersH Hartley Sweeten
As reported by checkpatch.pl, the private data members do not need the volatile tag. Remove them. 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>
2014-03-17staging: comedi: gsc_hpdi: remove hpdi_writel()H Hartley Sweeten
This helper function is used to OR bits with a software copy of a register value then writel() the new value to the register. The software copies are never updated in the driver so they are always 0 due to the kzalloc. Remove the unnecessary 'bits' from the private data and replace the hpdi_writel() calls with writel(). 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>
2014-03-17staging: comedi: gsc_hpdi: remove disable_plx_interrupts()H Hartley Sweeten
This helper function is just a simple writel(). Remove it. 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>
2014-03-17staging: comedi: gsc_hpdi: rename init_hpdi()H Hartley Sweeten
For aesthetics, rename this function so it has namespace associated with the driver. 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>
2014-03-17staging: comedi: gsc_hpdi: rename init_plx9080()H Hartley Sweeten
For aesthetics, rename this function so it has namespace associated with the driver. 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>
2014-03-17staging: comedi: gsc_hpdi: rename hpdi_find_board()H Hartley Sweeten
For aesthetics, rename this function so it has namespace associated with the driver. 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>
2014-03-17staging: comedi: gsc_hpdi: rename the (*auto_attach) and (*detach) functionsH Hartley Sweeten
For aesthetics, rename these functions so they have namespace associated with the driver. 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>
2014-03-17staging: comedi: gsc_hpdi: rename drain_dma_buffers()H Hartley Sweeten
For aesthetics, rename this function so it has namespace associated with the driver. 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>
2014-03-17staging: comedi: gsc_hpdi: rename handle_interrupt()H Hartley Sweeten
For aesthetics, rename this function so it has namespace associated with the driver. 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>
2014-03-17staging: comedi: gsc_hpdi: rename abort_dma()H Hartley Sweeten
For aesthetics, rename this function so it has namespace associated with the driver. Also, remove the unnecessary forward declaration. 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>
2014-03-17staging: comedi: gsc_hpdi: rename hpdi_cancel()H Hartley Sweeten
For aesthetics, rename this function so it has namespace associated with the driver. 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>
2014-03-17staging: comedi: gsc_hpdi: tidy up hpdi_cmd_test()H Hartley Sweeten
For aesthetics, rename this function so it has namespace associated with the driver and move it so that it is not in the middle of the interrupt support code. Absorb the di_cmd_test() helper and tidy up the function a bit. 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>
2014-03-17staging: comedi: gsc_hpdi: tidy up hpdi_cmd()H Hartley Sweeten
For aesthetics, rename this function so it has namespace associated with the driver and move it so that it is not in the middle of the interrupt support code. Absorb the di_cmd() helper and tidy up the function a bit. 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>
2014-03-17staging: comedi: gsc_hpdi: tidy up setup_dma_descriptors()H Hartley Sweeten
For aesthetics, rename this function so it has namespace associated with the driver and move it so that it is not in the middle of the async command support code. Tidy up the function a bit. 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>
2014-03-17staging: comedi: gsc_hpdi: tidy up dio_config_insn()H Hartley Sweeten
For aesthetics, rename this function so it has namespace associated with the driver and move it so that it is not in the middle of the async command support code. Absorb the dio_config_block_size() helper function and remove the forward declaration. 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>
2014-03-17staging: comedi: gsc_hpdi: move the (*auto_attach) helper functionsH Hartley Sweeten
For aesthetics, move a couple helper functions that are only called by the (*auto_attach) closer to that function. 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>
2014-03-17staging: comedi: gsc_hpdi: absorb setup_subdevices()H Hartley Sweeten
This function is only called by the (*auto_attach). Absorb it into that function to clarify the attach and remove the need for some of the forward declarations. For aesthetics, add some whitespace to the subdevice init. 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>
2014-03-17staging: comedi: gsc_hpdi: move the (*auto_attach) and (*detach) functionsH Hartley Sweeten
Move these functions closer to the comedi_driver declaration. This removes the need for one of the forward declarations. 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>
2014-03-17staging: comedi: fl512: tidy up the multi-line commentsH Hartley Sweeten
Tidy up the multi-line comments to follow the CodingStyle. Add the GPL boilerplate comment found in other comedi drivers. 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>
2014-03-17staging: comedi: fl512: tidy up fl512_ao_insn_read()H Hartley Sweeten
Tidy up this function. 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>
2014-03-17staging: comedi: fl512: tidy up fl512_ao_insn_write()H Hartley Sweeten
Tidy up this function. Only save the last value written for readback. 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>
2014-03-17staging: comedi: fl512: define the register mapH Hartley Sweeten
Define the register map and remove the magic values and some unnecessary comments. For aesthetics, remove the 'iobase' local variable and use dev->iobase directly. 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>
2014-03-17staging: comedi: fl512: tidy up fl512_ao_insn_read()H Hartley Sweeten
For aesthetics, tidy up this function to match the style used in most of the comedi drivers for analog output (*insn_read) functions. 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>
2014-03-17staging: comedi: fl512: remove Fl512_SIZE defineH Hartley Sweeten
This define is only used in the comedi_request_region() call to specify the size of the I/O region to request. Remove the define and just open code the value. 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>
2014-03-17staging: comedi: fl512: rename the subdevice (*insn_{read, write}) functionsH Hartley Sweeten
For aesthetics, rename these functions and remove the unnecessary comments. 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>
2014-03-17staging: comedi: fl512: tidy up subdevice initH Hartley Sweeten
Remove the obvious comments and add some whitespace to the subdevice init. 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>
2014-03-17staging: comedi: 8255_pci: initialize MITE data windowIan Abbott
According to National Instruments' PCI-DIO-96/PXI-6508/PCI-6503 User Manual, the physical address in PCI BAR1 needs to be OR'ed with 0x80 and written to register offset 0xC0 in the "MITE" registers (BAR0). Do so during initialization of the National Instruments boards handled by the "8255_pci" driver. The boards were previously handled by the "ni_pcidio" driver, where the initialization was done by `mite_setup()` in the "mite" module. The "mite" module comes with too much extra baggage for the "8255_pci" driver to deal with so use a local, simpler initialization function. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Cc: <stable@vger.kernel.org> # 3.10.y, 3.11.y, 3.12.y, 3.13.y, 3.14.y Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-17staging: comedi: dac02: introduce comedi driver for DAC02 boardsH Hartley Sweeten
This board is currently supported by the poc driver. That driver used to support a number of simple boards but now only provides support for the DAC02 board. Introduce a new comedi driver specifically for the DAC02 board. This allows cleaning up all the cruft. 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>
2014-03-17Staging: comedi: ni_daq_dio24: fix a line over 80 charactersMatei Oprea
Fix a coding style issue. Signed-off-by: Matei Oprea <eu@opreamatei.ro> Cc: ROSEdu Kernel Commmunity <firefly@lists.rosedu.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-17staging: comedi: c6xdigio: update the MODULE_DESCRIPTIONH Hartley Sweeten
Change the generic MODULE_DESCRIPTION text to something more specific for this driver. 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>
2014-03-17staging: comedi: c6xdigio: tidy up the multi-line commentsH Hartley Sweeten
Reformat the multi-line comments at the beginning of the code to follow the CodingStyle. 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>
2014-03-17staging: comedi: c6xdigio: add readback of last pwm channel valuesH Hartley Sweeten
Add and (*insn_read) for the PWM subdevice to allow reading back the last value written to the channels. There are only 2 PWM channels and they have a maxdata of 500. Pack the last values in the subdevice 'state' instead of adding a private data struct to this driver. 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>
2014-03-17staging: comedi: c6xdigio: use comedi_offset_munge()H Hartley Sweeten
The value read from the encoders is in two's complement format. Use the comedi_offset_munge() helper to convert the value to offset binary. 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>
2014-03-17staging: comedi: c6xdigio: consolidate the board_init()H Hartley Sweeten
For aesthetics, rename this function so it has namespace associated with the driver. Absorb the c6xdigio_pwm_init() and c6xdigio_encoder_reset() helpers. 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>
2014-03-17staging: comedi: c6xdigio: tidy up subdevice 1 initH Hartley Sweeten
Remove the commented out init of the 'trig'. For aesthetics, add some whitespace to the init and rename the 'insn_read' function. 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>
2014-03-17staging: comedi: c6xdigio: tidy up subdevice 0 initH Hartley Sweeten
This subdevice is a PWM output not and analog output, fix the 'type'. Fix the subdevice 'range', range_bipolar does not make sense for a PWM output. The range_unknown is a better choice. Remove the commented out init of the 'trig'. For aesthetics, add some whitespace to the init and rename the 'insn_write' function. 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>
2014-03-17staging: comedi: c6xdigio: define the data register bitsH Hartley Sweeten
To clarify the code, define the bits in the data register and remove the magic numbers. 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>
2014-03-17staging: comedi: c6xdigio: tidy up c6xdigio_pwm_write()H Hartley Sweeten
The 10-bit pwm value (2-498) is written by banging 2-bits in the data register. Refactor this function to remove the need for the union pcmcmdtype and struct pwmbitstype. 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>
2014-03-17staging: comedi: c6xdigio: introduce c6xdigio_get_encoder_bits()H Hartley Sweeten
The 24-bit encoder value is read using 3-bits in the status register. The data register is banged between each read of the status register to advance the bits. Introduce a helper function to handle this and remove the union encvaluetype and struct encbitsbyte. 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>
2014-03-17staging: comedi: c6xdigio: define the register mapH Hartley Sweeten
The register map was already defined but it was not being used. Rename to defines and use them in the code. 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>
2014-03-17staging: comedi: c6xdigio: introduce c6xdigio_write_data()H Hartley Sweeten
All writes to the hardware involve writing the the data register then checking the status register. Introduce a helper function to handle this. 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>
2014-03-17staging: comedi: c6xdigio: change first param to c6xdigio_chk_status()H Hartley Sweeten
For aesthetics, pass the comedi_device pointer instead of the dev->iobase as the first parameter. 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>
2014-03-17staging: comedi: c6xdigio: tidy up C6X_encInput()H Hartley Sweeten
Rename the CamelCase function. For aesthetics, pass the comedi_device pointer instead of the dev->iobase as the first parameter. 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>