summaryrefslogtreecommitdiff
path: root/drivers/staging/comedi
AgeCommit message (Collapse)Author
2012-03-09staging/comedi/drivers fix spelling errorsAlexandru Guduleasa
Fix the following spelling errors: inital -> initial continous -> continuous aquisition -> acquisition aquisitions -> acquisitions immidiately -> immediately Signed-off-by: Alexandru Guduleasa <alexandru.guduleasa@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-02-24staging: Fix typo in unioxx5.cMasanari Iida
Correct spelling "erorr" to "error" in drivers/stating/comedi/drivers/unioxx5.c Signed-off-by: Masanari Iida <standby24x7@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-02-09Staging: comedi: logical || vs bitwise |Dan Carpenter
These are bitfields and the intend was to OR them together. A logical OR here is simply 1. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Acked-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-02-09staging: comedi: ni_pcidio: Support trailing edge external triggerIan Abbott
This patch is ported over by me (Ian Abbott) from the out-of-tree Comedi git repository at "git://comedi.org/git/comedi/comedi.git". The original patch is by Nicholas Nell. The patch adds support for trailing (falling) edge external triggers for scans in asynchronous command support in the ni_pcidio driver. This is supported at least on the PCI-DIO_32HS and PCI-6533 boards; not sure about the other boards. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Cc: Nicholas Nell <nicholas.nell@colorado.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-02-09staging: comedi: ni_pcidio: Add comedi_poll supportIan Abbott
This patch is ported over by me (Ian Abbott) from the out-of-tree Comedi git repository at "git://comedi.org/git/comedi/comedi.git". The original patch is by Nicholas Nell. The patch adds support for the COMEDI_POLL ioctl to the ni_pcidio driver. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Cc: Nicholas Nell <nicholas.nell@colorado.edu> Cc: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-02-09staging: comedi: ni_pcidio: Grab MITE spinlock while preparing DMA.Ian Abbott
When setting up the DMA for 'read' streaming acquisition command, grab the MITE channel spinlock before preparing and arming the DMA. Change inspired by ni_ai_setup_MITE_dma() in ni_mio_common.c. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-02-09staging: comedi: ni_pcidio: Mark buffer for writing when setting up DMA.Ian Abbott
When setting up the DMA for 'read' streaming acquisition on the DIO subdevice, mark the whole buffer as writable before starting the DMA. This prevents a spurious detection of a DMA overwrite of good data during the first interrupt. Problem reported by Nicholas Nell. Fix suggested by Frank Mori Hess. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-02-09staging: comedi: adv_pci_dio: Advantech PCI-1739U supportIan Abbott
This patch is ported over by me (Ian Abbott) from the out-of-tree Comedi git repository at "git://comedi.org/git/comedi/comedi.git". The original patch is by Nicholas Nell. ----- Advantech PCI-1739U support Hello, I've added a bit of simple configuration to adv_pci_dio.c in order to make the PCI-1739U work with the adv_pci_dio driver. I have tested inputs only so far but they seem to work. A git style patch is attached. Thanks, -- Nicholas Nell Professional Research Assistant University of Colorado ----- Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Cc: Nico Nell <nicholas.nell@colorado.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-02-09staging: comedi: me4000: Check for unsupported INSN_CONFIG.Ian Abbott
The INSN_CONFIG handler for the DIO subdevice should error out for unsupported configuration instruction codes. Also fix incorrect use of constant COMEDI_OUTPUT where INSN_CONFIG_DIO_OUTPUT was meant. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-02-09staging: comedi: dt2801: do INSN_CONFIG properly for DIO subdevice.Ian Abbott
Handle INSN_CONFIG_DIO_INPUT, INSN_CONFIG_DIO_OUTPUT and INSN_CONFIG_DIO_QUERY in data[0]. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-02-09staging: comedi: ni_pcimio: Add support for NI PXIe-6251Ian Abbott
Paul Fulmek reports that PXIe-6251 works the same as the existing PCIe-6251 and just needs the new PCI device ID adding to ni_pci_table[] and a new entry adding to ni_boards[] based on the existing entry for PCIe-6251. The new entry has PCI device ID 0x72e8 and board name "pxie-6251". Thanks Paul! Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-01-13module_param: make bool parameters really bool (drivers & misc)Rusty Russell
module_param(bool) used to counter-intuitively take an int. In fddd5201 (mid-2009) we allowed bool or int/unsigned int using a messy trick. It's time to remove the int/unsigned int option. For this version it'll simply give a warning, but it'll break next kernel version. Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2012-01-09Merge branch 'staging-next' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging * 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (466 commits) net/hyperv: Add support for jumbo frame up to 64KB net/hyperv: Add NETVSP protocol version negotiation net/hyperv: Remove unnecessary kmap_atomic in netvsc driver staging/rtl8192e: Register against lib80211 staging/rtl8192e: Convert to lib80211_crypt_info staging/rtl8192e: Convert to lib80211_crypt_data and lib80211_crypt_ops staging/rtl8192e: Add lib80211.h to rtllib.h staging/mei: add watchdog device registration wrappers drm/omap: GEM, deal with cache staging: vt6656: int.c, int.h: Change return of function to void staging: usbip: removed unused definitions from header staging: usbip: removed dead code from receive function staging:iio: Drop {mark,unmark}_in_use callbacks staging:iio: Drop buffer mark_param_change callback staging:iio: Drop the unused buffer enable() and is_enabled() callbacks staging:iio: Drop buffer busy flag staging:iio: Make sure a device is only opened once at a time staging:iio: Disallow modifying buffer size when buffer is enabled staging:iio: Disallow changing scan elements in all buffered modes staging:iio: Use iio_buffer_enabled instead of open coding it ... Fix up conflict in drivers/staging/iio/adc/ad799x_core.c (removal of module_init due to using module_i2c_driver() helper, next to removal of MODULE_ALIAS due to using MODULE_DEVICE_TABLE instead).
2012-01-08Merge branch 'for-linus' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (53 commits) Kconfig: acpi: Fix typo in comment. misc latin1 to utf8 conversions devres: Fix a typo in devm_kfree comment btrfs: free-space-cache.c: remove extra semicolon. fat: Spelling s/obsolate/obsolete/g SCSI, pmcraid: Fix spelling error in a pmcraid_err() call tools/power turbostat: update fields in manpage mac80211: drop spelling fix types.h: fix comment spelling for 'architectures' typo fixes: aera -> area, exntension -> extension devices.txt: Fix typo of 'VMware'. sis900: Fix enum typo 'sis900_rx_bufer_status' decompress_bunzip2: remove invalid vi modeline treewide: Fix comment and string typo 'bufer' hyper-v: Update MAINTAINERS treewide: Fix typos in various parts of the kernel, and fix some comments. clockevents: drop unknown Kconfig symbol GENERIC_CLOCKEVENTS_MIGR gpio: Kconfig: drop unknown symbol 'CS5535_GPIO' leds: Kconfig: Fix typo 'D2NET_V2' sound: Kconfig: drop unknown symbol ARCH_CLPS7500 ... Fix up trivial conflicts in arch/powerpc/platforms/40x/Kconfig (some new kconfig additions, close to removed commented-out old ones)
2011-12-16staging: comedi_fops.c whitespace fixesFlorian Schmaus
Changed whitespaces in comedi/*.c to tabs where necessary. All .c files within comedi now have no obvious style problems as reported by checkpatch.pl Signed-off-by: Florian Schmaus <fschmaus@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-13Staging: comedi: fix printk issue in contec_pci_dio.cRavishankar karkala Mallikarjunayya
This is a patch to the contec_pci_dio.c file that fixes up a printk warning found by the checkpatch.pl tool. Converted printks to dev_dbg(). Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-13Staging: comedi: fix printk issue in das1800.cRavishankar karkala Mallikarjunayya
This is a patch to the das1800.c file that fixes up a printk warning found by the checkpatch.pl tool. Converted printk to dev_<levels>. Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-13Staging: comedi: fix printk issue in das1800.cRavishankar karkala Mallikarjunayya
This is a patch to the das1800.c file that fixes up a printk warning found by the checkpatch.pl tool. Included KERN_facility levels for printk. Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-13Staging: comedi: fix printk issue in cb_pcidas64.cRavishankar karkala Mallikarjunayya
This is a patch to the cb_pcidas64.c file that fixes up a printk warning found by the checkpatch.pl tool. Converted printks to dev_<levels> and Removed unnecessary printk statements. Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-13Staging: comedi: fix printk issue in cb_pcidas64.cRavishankar karkala Mallikarjunayya
This is a patch to the cb_pcidas64.c file that fixes up a printk warning found by the checkpatch.pl tool. Converted printks to dev_<levels> and Removed unnecessary printk statements. Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-13Staging: comedi: fix printk issue in cb_pcidas.cRavishankar karkala Mallikarjunayya
This is a patch to the cb_pcidas.c file that fixes up a printk warning found by the checkpatch.pl tool. Converted printks to dev_<levels>.. Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-13Staging: comedi: fix printk issue in cb_pcidas.cRavishankar karkala Mallikarjunayya
This is a patch to the cb_pcidas.c file that fixes up a printk warning found by the checkpatch.pl tool. Converted printks to dev_dbg().. Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-13Staging: comedi: fix printk issue in das1800.cRavishankar karkala Mallikarjunayya
This is a patch to the das1800.c file that fixes up a printk warning found by the checkpatch.pl tool. Converted printks to dev_dbg(). Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-13Staging: comedi: fix printk issue in das1800.cRavishankar karkala Mallikarjunayya
This is a patch to the das1800.c file that fixes up a printk warning found by the checkpatch.pl tool. Coverted printks to dev_<levels>. Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-13Staging: comedi: fix printk issue in daqboard2000.cRavishankar karkala Mallikarjunayya
This is a patch to the daqboard2000.c file that fixes up a printk warning found by the checkpatch.pl tool. Converted printks to dev_dbg(). Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-13Staging: comedi: fix printk issue in das1800.cRavishankar karkala Mallikarjunayya
This is a patch to the das1800.c file that fixes up a printk warning found by the checkpatch.pl tool. Converted printks to dev_<levels>. Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-13Staging: comedi: fix brace coding style issue in ni_at_a2150.cRavishankar karkala Mallikarjunayya
This is a patch to the ni_at_a2150.c file that fixes up a brace warning found by the checkpatch.pl tool. Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-13Staging: comedi: fix printk issue in jr3_pci.cRavishankar karkala Mallikarjunayya
This is a patch to the jr3_pci.c file that fixes up a printk warning found by the checkpatch.pl tool. Converted printks to dev_<levels> and Removed unnecessary printk statements. Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-13Staging: comedi: fix printk issue in jr3_pci.cRavishankar karkala Mallikarjunayya
This is a patch to the jr3_pci.c file that fixes up a printk warning found by the checkpatch.pl tool. Converted printks to dev_dbg(). Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-13Staging: comedi: fix printk issue in daqboard2000.cRavishankar karkala Mallikarjunayya
This is a patch to the daqboard2000.c file that fixes up a printk warning found by the checkpatch.pl tool. converted printks to dev_printk and Removed unnecessary printk statements. Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-13Staging: comedi: fix printk issue in daqboard2000.cRavishankar karkala Mallikarjunayya
This is a patch to the daqboard2000.c file that fixes up a printk warning found by the checkpatch.pl tool. Converted printks to dev_dbg(). Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-13Staging: comedi: fix printk issue in pcmuio.cRavishankar karkala Mallikarjunayya
This is a patch to the pcmuio.c file that fixes up a printk warning found by the checkpatch.pl tool. Converted printks to dev_dbg(). Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-13Staging: comedi: fix printk issue in pcmuio.cRavishankar karkala Mallikarjunayya
This is a patch to the pcmuio.c file that fixes up a printk warning found by the checkpatch.pl tool. Converted printks to dev_functions. Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-13Staging: comedi: fix printk issue in pcmuio.cRavishankar karkala Mallikarjunayya
This is a patch to the pcmuio.c file that fixes up a printk warning found by the checkpatch.pl tool. Converted printks to dev_functions. Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-13Staging: comedi: fix printk issue in dt3000.cRavishankar karkala Mallikarjunayya
This is a patch to the dt3000.c file that fixes up a printk warning found by the checkpatch.pl tool. Converted printks to dev_<levels>. Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-13Staging: comedi: fix printk issue in dt3000.cRavishankar karkala Mallikarjunayya
This is a patch to the dt3000.c file that fixes up a printk warning found by the checkpatch.pl tool. Converted printks to dev_functions. Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-13Staging: comedi: fix printk issue in dt3000.cRavishankar karkala Mallikarjunayya
This is a patch to the dt3000.c file that fixes up a printk warning found by the checkpatch.pl tool. Converted printks to dev_<levels>. Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-13Staging: comedi: fix printk issue in dt3000.cRavishankar karkala Mallikarjunayya
This is a patch to the dt3000.c file that fixes up a printk warning found by the checkpatch.pl tool. Added KERN_facility levels. Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-13Staging: comedi: fix printk issue in dt3000.cRavishankar karkala Mallikarjunayya
This is a patch to the dt3000.c file that fixes up a printk warning found by the checkpatch.pl tool. Converted printks to dev_<levels>. Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-13Staging: comedi: fix printk issue in jr3_pci.cRavishankar karkala Mallikarjunayya
This is a patch to the jr3_pci.c file that fixes up a printk warning found by the checkpatch.pl tool. Added KERN_facility levels for printks. Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-09Merge 3.2-rc5 into staging-nextGreg Kroah-Hartman
This resolves the conflict in the drivers/staging/iio/industrialio-core.c file due to two different changes made to resolve the same problem. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-08Staging: comedi: fix initialise statics to 0 or NULL issue in cb_das16_cs.cRavishankar karkala Mallikarjunayya
This is a patch to the cb_das16_cs.c file that fixes up a initialise statics to 0 or NULL warning found by the checkpatch.pl tool. Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-08Staging: comedi: fix initialise statics to 0 or NULL issue in dt3000.cRavishankar karkala Mallikarjunayya
This is a patch to the dt3000.c file that fixes up a initialise statics to 0 or NULL warning found by the checkpatch.pl tool. Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-08Staging: comedi: fix line over 80 character issue in cb_pcimdda.cRavishankar karkala Mallikarjunayya
This is a patch to the cb_pcimdda.c file that fixes up a line over 80 character warning found by the checkpatch.pl tool. Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-08Staging: comedi: fix brace coding style issue in daqboard2000.cRavishankar karkala Mallikarjunayya
This is a patch to the daqboard2000.c file that fixes up a brace warning found by the checkpatch.pl tool. Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-08staging: comedi: comedi_fops: Removed int overflow checkFlorian Schmaus
This became unnecessary with the previous commit. Improved the readability of the remaining check, by using UINT_MAX. Signed-off-by: Florian Schmaus <fschmaus@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-08staging: comedi: comedi_fops: Replace deprecated strict_strtoul with kstrtouintFlorian Schmaus
As reported by checkpatch.pl strict_strtoul should be replaced. It was replaced with kstrtouint since async->max_bufsize is an unsigned int anyway. Signed-off-by: Florian Schmaus <fschmaus@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-08Staging: comedi: unlock on error in usbduxsigma_attach()Dan Carpenter
We should release the udev->sem lock before returning. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-08Staging: comedi: unlock on error in usbdux_ao_inttrig()Dan Carpenter
If we had an invalid trignum (anything other than zero is invalid) then we returned without unlocking. I've modified this function to just have one return point. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-02treewide: Fix typos in various parts of the kernel, and fix some comments.Justin P. Mattock
The below patch fixes some typos in various parts of the kernel, as well as fixes some comments. Please let me know if I missed anything, and I will try to get it changed and resent. Signed-off-by: Justin P. Mattock <justinmattock@gmail.com> Acked-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
generated by cgit v1.2.3 (git 2.0.4) at 2024-09-19 06:11:35 +0000