- 02 Sep, 2014 40 commits
-
-
Ian Abbott authored
Some functions in "amplc_pci230.c" are declared `inline`. Remove the `inline` specifiers and let the compiler do what it wants with them. Signed-off-by:
Ian Abbott <abbotti@mev.co.uk> Reviewed-by:
H Hartley Sweeten <hsweeten@visionengravers.com> Signed-off-by:
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
Ian Abbott authored
`pci230_ai_read()` reads a sample from the ADC data register and converts it to a comedi sample value. The AI sample may have 12 or 16 bits of resolution, depending on the board type, but 12-bit sample values are in bits 15 to 4 of the register. The hardware value is signed, 2's complement if set to a bipolar mode, or unsigned, straight binary if set to a unipolar mode. To convert to a Comedi sample value it may need shifting right by 4 bits, and the top bit of the sample value may need to be toggled. Simplify the existing code by doing the 2's complement to straight binary conversion before the shift. That way, it is always bit 15 that is inverted regardless of the resolution. Signed-off-by:
-
Ian Abbott authored
`pci230_ao_mangle_datum()` converts comedi sample values for the AO subdevice to hardware register values. The comedi sample value will be an unsigned value in the range 0 to 4095 (assuming 12-bit resolution). The hardware wants the value shifted so the m.s. bit of the sample in in bit 15. If set to a bipolar range, it also expects a 2's complement value, so the top bit of the sample value needs to be inverted in that case. Simplify the existing code by doing the 2's complement conversion after the shift. That way, it is always bit 15 that is inverted regardless of the resolution. Signed-off-by:
-
Ian Abbott authored
The `ai_bits`, `ao_bits`, and `min_hwver` members of `struct pci230_board` are only set to small, non-negative values, so make them `unsigned char`. The `have_dio` member is used as a boolean so change it to a bitfield of type `bool`. Signed-off-by:
-
Ian Abbott authored
The PCI230(+) has an AO subdevice with 2 channels, but the PCI260(+) has none. The `ao_chans` member of `struct pci230_board` indicates whether the board has an AO subdevice and the number of AO channels. The `ao_bits` member indicates the AO sample width in bits and will only be non-zero for boards with an AO subdevice. Use `ao_bits` to indicate whether the board has an AO subdevice. If it has, assume the the number of AO channels is 2. Then the `ao_chans` member becomes redundant and can be removed. Signed-off-by:
-
Ian Abbott authored
All boards supported by the "amplc_pci230" driver have 16 AI channels, so the `ai_chans` member of `struct pci230_board` is superfluous and can be removed. Signed-off-by:
-
Ian Abbott authored
`pci230_alloc_private()` is now only called from `pci230_auto_attach()` to allocate private device storage and initialize various spin-lock members therein. Absorb the body of `pci230_alloc_private()` into `pci230_auto_attach()` itself. Signed-off-by:
-
Ian Abbott authored
The comedi core module calls `comedi_set_hw_dev()` to associate the hardware `struct device` with the `struct comedi_device` before it calls the comedi driver's "auto_attach" hook `pci230_auto_attach()`. There is no need for `pci230_auto_attach()` to call `comedi_set_hw_dev()` itself, so remove the call. Signed-off-by:
-
Ian Abbott authored
`pci230_attach_common()` is now only called from `pci230_auto_attach()`, so absorb it into that function. Signed-off-by:
-
Ian Abbott authored
Since the comedi driver's "detach`" handler `pci230_detach()` now merely calls `comedi_pci_detach()` with the same parameter, use `comedi_pci_detach()` itself as the "detach" handler. Signed-off-by:
-
Ian Abbott authored
This driver no longer supports a "legacy" attach mechanism that searches for a suitable PCI device and increments it's reference count, but since the common "detach" handler `pci230_detach()` still has a left-over `pci_dev_put()`, a matching `pci_dev_get()` is needed in the "auto_attach" handler `pci230_auto_attach()`. There is no longer any reason to "get" and "put" the PCI device, so those calls can be removed. Signed-off-by:
-
Ian Abbott authored
The "amplc_pci230" driver currently retains the legacy attach mechanism to allow devices to be attached manually via the `COMEDI_DEVCONFIG` ioctl. The only real use for this is to pretend that a PCI230+ or PCI260+ is a PCI230 or PCI260 for backwards compatibility, as they have different number of bits of resolution on the AI subdevice. Since the card would be automatically configured as a PCI230+ or PCI260+ at PCI probe time anyway, hopefully any users who want it to appear as a PCI230 or PCI260 would have got tired of removing the automatically configured device and configuring it manually by now and will have updated their software to cope with the PCI230+ or PCI260+. Get rid of the legacy attach mechanism by removing the Comedi driver "attach" handler `pci230_attach()` and associated code. Also remove the "wildcard" entry from the board table `pci230_boards[]` as it is no longer needed. Don't bother initializing the `board_name`, `offset`, and `num_names` members of `struct comedi_driver amplc_pci230_driver` any longer as they are only needed when configuring the device manually. Signed-off-by:
-
Ian Abbott authored
Where the only thing in an `else { ... }` block is another `if` statement, collapse it to an `else if {` block where it makes sense to do so. Signed-off-by: -
Ian Abbott authored
Remove some pairs of parentheses that don't really improve readability. Also, reduce the amount of leading whitespace in a few places. Signed-off-by:
-
Ian Abbott authored
Fix checkpatch issues: "CHECK: Please don't use multiple blank lines". Signed-off-by:
-
Ian Abbott authored
Replace the generic, Comedi low-level driver module description string with something more specific. Signed-off-by:
-
navin patidar authored
Signed-off-by:
navin patidar <navin.patidar@gmail.com> Signed-off-by:
-
navin patidar authored
Signed-off-by:
-
navin patidar authored
Signed-off-by:
-
navin patidar authored
Signed-off-by:
-
navin patidar authored
Signed-off-by:
-
navin patidar authored
Signed-off-by:
-
navin patidar authored
Signed-off-by:
-
navin patidar authored
Rename CamelCase variables and function name. Signed-off-by:
-
Sudip Mukherjee authored
fixed sparse warning: incompatible types in comparison expression (different address spaces) wolw and reg both are being used only for the initialization of the __iomem area. Signed-off-by:
Sudip Mukherjee <sudip@vectorindia.org> Signed-off-by:
-
Chase Southwood authored
This patch completes two final matters of cleanup which are each too small for their own patch. It corrects a couple of indentation issues and removes a return statement at the end of a void function. Signed-off-by:
Chase Southwood <chase.southwood@gmail.com> Reviewed-by:
-
Chase Southwood authored
Now that commented out code has been removed, else statements can move to the same line as the close brace of the if statement. Also, a blank line has been added between declarations and code where needed. Signed-off-by:
-
Chase Southwood authored
Signed-off-by:
-
Chase Southwood authored
We don't need braces around single-statement blocks. Signed-off-by:
-
Chase Southwood authored
dev_err() is preferred to printk() in device drivers. Signed-off-by:
-
Chase Southwood authored
Checkpatch pointed out a void function with a return statement. It can be removed. Signed-off-by:
-
Greg Donald authored
Fix checkpatch.pl return is not a function, parentheses are not required error Signed-off-by:
Greg Donald <gdonald@gmail.com> Signed-off-by:
-
Greg Donald authored
Fix checkpatch.pl return is not a function, parentheses are not required errors Signed-off-by:
-
Aaro Koskinen authored
Replace a magic value with #defined macro. Signed-off-by:
Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by:
-
Aaro Koskinen authored
Use generic control packet header structure definition. Signed-off-by:
-
Seunghun Lee authored
split two assignments into the two assignments on two lines. CC: Lidza Louina <lidza.louina@gmail.com> CC: Mark Hounschell <markh@compro.net> Signed-off-by:
Seunghun Lee <waydi1@gmail.com> Signed-off-by:
-
Konrad Zapalowicz authored
This commit changes the memory allocation flags to ATOMIC in order to avoid sleeping in the nowait/nolock code. Signed-off-by:
Konrad Zapalowicz <bergo.torino+kernel@gmail.com> Signed-off-by:
-
Ramon Fried authored
This patch fixes the following checkpatch.pl warning: WARNING: Possible unnecessary 'out of memory' message #116: FILE: ./xlr_net.c:116: + if (!skb) { + pr_err("SKB allocation failed\n"); Signed-off-by:Ramon Fried <ramon.fried@gmail.com> Signed-off-by:
-
Chase Southwood authored
Sparse shows a couple of warnings like: drivers/staging/comedi/drivers/usbduxsigma.c:787:23: warning: cast to restricted __be32 Looking at the indicated lines shows that the issue is caused by an incorrect cast to uint32_t instead of __be32. Fix this cast. Signed-off-by:
-
Chase Southwood authored
Sparse shows a couple of warnings like: drivers/staging/comedi/drivers/usbdux.c:889:20: warning: incorrect type in assignment (different base types) drivers/staging/comedi/drivers/usbdux.c:889:20: expected unsigned short [unsigned] [short] [usertype] <noident> drivers/staging/comedi/drivers/usbdux.c:889:20: got restricted __le16 [usertype] <noident> This is the result of a couple of calls to cpu_to_le16() being assigned to uint16_t typed variables. Switch the types of these variables/pointers to __le16 accordingly. Signed-off-by:
-
