aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/comedi
Commit message (Collapse)AuthorAgeFilesLines
...
* | Staging: Merge branch 'staging-next' into 2.6.38-rc3Greg Kroah-Hartman2011-02-021-1/+2
|\| | | | | | | | | | | | | | | | | This was done to resolve conflicts in the following files due to patches in Linus's tree and in the staging-next tree: drivers/staging/brcm80211/brcmsmac/wl_mac80211.c drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging: comedi: ni_labpc: Use shared IRQ for PCMCIA cardIan Abbott2011-01-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | The ni_labpc driver module only requests a shared IRQ for PCI devices, requesting a non-shared IRQ for non-PCI devices. As this module is also used by the ni_labpc_cs module for certain National Instruments PCMCIA cards, it also needs to request a shared IRQ for PCMCIA devices, otherwise you get a IRQ mismatch with the CardBus controller. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Cc: stable <stable@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | Staging: comedi: Fix checpatch.pl issues in file rtd520.cNick Robinson2011-01-311-164/+157
| | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes the checkpatch errors listed below: ERROR: code indent should use tabs where possible WARNING: space prohibited between function name and open parenthesis '(' WARNING: please, no spaces at the start of a line WARNING: braces {} are not necessary for single statement blocks WARNING: printk() should include KERN_ facility level Signed-off-by: Nick Robinson <nr33@msstate.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | staging: comedi: Make INSN_BITS behavior consistent across driversIan Abbott2011-01-211-2/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most comedi hardware drivers that support the INSN_BITS instruction ignore the base channel (specified by insn->chanspec) and assume it is 0. The base channel is supposed to affect how the mask (in data[0]) and bits (in data[1]) are treated. Bit 0 applies to the base channel, bit 1 applies to base channel plus 1, etc. For subdevices with no more than 32 channels, this patch modifies the chanspec and data before presenting it to the hardware driver, and modifies the data bits read back by the hardware driver (into data[1]). This makes it appear to the hardware driver that the base channel was set to 0. For subdevices with more than 32 channels, the instruction is left unmodified, as it is assumed that the hardware driver takes note of the base channel in this case in order to provide access beyond channel 31. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | staging/comedi/icp_multi: fix sparse warning "obsolete struct initializer"Peter Huewe2011-01-211-7/+7
| | | | | | | | | | | | | | | | | | | | | | This patch fixes the sparse warnings "obsolete struct initializer, use C99 syntax" in icp_multi.c by converting the struct to C99 syntax KernelVersion: linux-next-20110110 Signed-off-by: Peter Huewe <peterhuewe@gmx.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | staging/comedi/me4000: fix sparse warning "obsolete struct initializer"Peter Huewe2011-01-211-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | This patch fixes the sparse warnings in me4000.c: me4000.c:122:1: warning: obsolete struct initializer, use C99 syntax me4000.c:123:1: warning: obsolete struct initializer, use C99 syntax me4000.c:124:1: warning: obsolete struct initializer, use C99 syntax me4000.c:125:1: warning: obsolete struct initializer, use C99 syntax by converting the struct to use C99 syntax Signed-off-by: Peter Huewe <peterhuewe@gmx.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | staging: comedi : Analog input trigerring modes for cb_pcidasBrice Dubost2011-01-211-5/+57
|/ | | | | | | | | This patch allows the possibility to choose between edgre triggering and level trigerring, for the analog input, on the Measurement Computing PCI-DAS* boards Signed-off-by: Brice Dubost <braice@braice.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: Fix checkpatch.pl issues in file s526.cXenofon Foukas2010-12-161-57/+82
| | | | | | | | | | | | | | This patch fixes the following issues in s526.c: WARNING: printk() should include KERN_ facility level WARNING: line over 80 characters ERROR: do not use C99 // comments WARNING: space prohibited between function name and open parenthesis '(' WARNING: braces {} are not necessary for any arm of this statement WARNING: suspect code indent for conditional statements (16, 16) Signed-off-by: Xenofon Foukas <foukas.xenofon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: Fix coding style issues in ii_pci20kc.cXenofon Foukas2010-12-161-20/+46
| | | | | | | | | | | This patch fixes the following issues in file ii_pci20kc.c: WARNING: please, no space before tabs WARNING: unnecessary whitespace before a quoted newline WARNING: line over 80 characters Signed-off-by: Xenofon Foukas <foukas.xenofon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: comedi: add support for newer jr3 1-channel pci boardRuben Smits2010-12-131-0/+7
| | | | | | | | add DEVICE_ID to table Signed-off-by: Ruben Smits <ruben.smits@mech.kuleuven.be> Cc: stable <stable@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: Fix coding style issues in ni_tiocmd.cXenofon Foukas2010-12-131-38/+33
| | | | | | | | | | | | | | | This patch fixes the following issues in ni_tiocmd.c: WARNING: braces {} are not necessary for any arm of this statement WARNING: braces {} are not necessary for single statement blocks WARNING: printk() should include KERN_ facility level WARNING: line over 80 characters __func__ should be used instead of gcc specific __FUNCTION__ ERROR: that open brace { should be on the previous line WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable Signed-off-by: Xenofon Foukas <foukas.xenofon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: Fix coding style issues in drivers.cXenofon Foukas2010-12-091-11/+15
| | | | | | | | This patch fixes line over 80 characters warning issues found in file drivers.c Signed-off-by: Xenofon Foukas <foukas.xenofon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: Merge 2.6.37-rc5 into staging-nextGreg Kroah-Hartman2010-12-071-2/+2
|\ | | | | | | | | | | | | | | | | This was done to handle a number of conflicts in the batman-adv and winbond drivers properly. It also now allows us to fix up the sysfs attributes properly that were not in the .37 release due to them being only in this tree at the time. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging: comedi: fix memory leakNicolas Kaiser2010-11-161-2/+2
| | | | | | | | | | | | | | Instead of freeing outBuffer, inBuffer gets freed twice. Signed-off-by: Nicolas Kaiser <nikai@nikai.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | drivers/staging: Remove unnecessary semicolonsJoe Perches2010-11-167-7/+7
| | | | | | | | | | Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | staging: comedi: fix typo in error messageNicolas Kaiser2010-11-161-1/+1
| | | | | | | | | | | | | | Fix typo in error message of dux commands allocation. Signed-off-by: Nicolas Kaiser <nikai@nikai.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | staging: Use vzallocJoe Perches2010-11-091-3/+1
| | | | | | | | | | Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | Staging: trivial: fix typos concerning "controller"Uwe Kleine-König2010-11-093-4/+4
| | | | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | Staging: trivial: fix typos concerning "configure"Uwe Kleine-König2010-11-091-1/+1
|/ | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: Final semaphore cleanupThomas Gleixner2010-10-303-5/+5
| | | | | | | | | | Fixup the last remaining users of DECLARE_MUTEX and init_MUTEX. Scripted conversion, resulting code is binary equivalent. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Greg Kroah-Hartman <gregkh@suse.de> LKML-Reference: <20100907125057.278833764@linutronix.de>
* Merge 'staging-next' to Linus's treeGreg Kroah-Hartman2010-10-2873-340/+319
|\ | | | | | | | | | | | | | | This merges the staging-next tree to Linus's tree and resolves some conflicts that were present due to changes in other trees that were affected by files here. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: comedi: Makefile: replace the use of <module>-objs with <module>-yTracey Dent2010-10-081-1/+1
| | | | | | | | | | | | | | Changed <module>-objs to <module>-y in Makefile. Signed-off-by: Tracey Dent <tdent48227@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: comedi: file: Removed braces from some statement blocksMaurice Dawson2010-10-071-12/+9
| | | | | | | | | | | | | | Unnecessary braces in some statement blocks Signed-off-by: Maurice Dawson <mauricedawson2699@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging: comedi: file: Removed whitespaces before quoted newlinesMaurice Dawson2010-10-051-7/+7
| | | | | | | | | | | | | | Unnecessary whitespaces before quoted newlines Signed-off-by: Maurice Dawson <mauricedawson2699@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: comedi: fix EXPORT SYMBOL coding style issue in ni_labpc.cMaurice Dawson2010-09-301-5/+5
| | | | | | | | | | | | | | | | | | This is a patch to the ni_labpc.c file that fixes up, EXPORT SYMBOL(foo) should immediately follow its function/variable warnings, found by the checkpatch.pl tool Signed-off-by: Maurice Dawson <mauricedawson2699@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging: update web addresses in stagingJustin P. Mattock2010-09-2650-50/+50
| | | | | | | | | | | | | | | | The below patch, is a simple fix to a broken web address not using a period in it's name. Signed-off-by: Justin P. Mattock <justinmattock@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: comedi: fix printk() coding style issue in adl_pci9111.cMaurice Dawson2010-09-201-7/+10
| | | | | | | | | | | | | | | | This is a patch to the adl_pci9111.c file that fixes all, printk() should include KERN-facility level, warnings found by the checkpatch.pl tool Signed-off-by: Maurice Dawson <mauricedawson2699@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging: comedi: fix signess bugVasiliy Kulikov2010-09-162-2/+2
| | | | | | | | | | | | | | | | ai_count and ao_counter are unsigned, check for < 0 doesn't make sense. Cast them to int. Signed-off-by: Vasiliy Kulikov <segooon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: comedi: fix macro coding style issue in adl_pci9111.cMaurice Dawson2010-09-141-6/+15
| | | | | | | | | | | | | | This is a patch that fixes up, macros with multiple statements should be enclosed in a do - while loop, coding style issue in the adl_pci9111.c file found by the checkpatch.pl tool Signed-off-by: Maurice Dawson <mauricedawson2699@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: comedi: fix space coding style issue in adl_pci9111.cMaurice Dawson2010-09-081-95/+98
| | | | | | | | | | | | | | | | This is a patch to the adl_pci9111.c file that fixes up multiple please, no space for starting a line warnings, found by the checkpatch.pl tool Signed-off-by: Maurice Dawson <mauricedawson2699@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging: Bulk convert the semaphore messThomas Gleixner2010-09-071-1/+1
| | | | | | | | | | | | | | | | init_MUTEX(_LOCKED) and DECLARE_MUTEX are going away. Bulk convert staging users. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: comedi: Fix unsigned return typeJulia Lawall2010-09-052-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In each case, the function has an unsigned return type, but returns a negative constant to indicate an error condition. For move_block_from_dma, there is only one call and the return value is dropped, so it need not be unsigned. For labpc_eeprom_write, there is only one call and the result is stored in a signed variable, so again the unsigned return type is not necessary. A sematic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> @exists@ identifier f; constant C; @@ unsigned f(...) { <+... * return -C; ...+> } // </smpl> Signed-off-by: Julia Lawall <julia@diku.dk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging: comedi: check return code of put_userVasiliy Kulikov2010-09-051-1/+2
| | | | | | | | | | | | | | Function put_user may fail. Check for it. Signed-off-by: Vasiliy Kulikov <segooon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging/trivial: fix typos concerning "access"Uwe Kleine-König2010-09-0413-17/+17
| | | | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging/comedi: fix syntax errorUwe Kleine-König2010-09-041-1/+1
| | | | | | | | | | | | | | | | I don't know how gcc interprets this, but it wouldn't surprise me if it choose something different than start-of-comment Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: comedi: fix brace coding style issue in dt2817.cSunny Aujla2010-08-311-7/+7
| | | | | | | | | | | | | | | | This is a patch to the dt2817.c file that fixes up all coding style issues found by the checkpatch.pl tool Signed-off-by: Sunny Aujla <sunnyfedora99@googlemail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging: comedi (cb_pcidas): use PCI_DEVICE() macroJavier Martinez Canillas2010-08-311-10/+9
| | | | | | | | | | | | | | This is the first of a patch series that uses PCI_DEVICE() macro for pci table entries on comedi drivers and thus improving readability. Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging: comedi (cb_pcidda): use PCI_DEVICE() macroJavier Martinez Canillas2010-08-311-8/+7
| | | | | | | | | | | | | | Use PCI_DEVICE() macro for pci table entries on comedi driver and thus improves readability. Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging: comedi (cb_pcidio): user PCI_DEVICE() macroJavier Martinez Canillas2010-08-311-5/+4
| | | | | | | | | | | | | | Use PCI_DEVICE() macro for pci table entries on comedi driver and thus improves readability. Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging: comedi (rtd520): use PCI_DEVICE() macroJavier Martinez Canillas2010-08-311-4/+3
| | | | | | | | | | | | | | Use PCI_DEVICE() macro for pci table entries on comedi driver and thus improves readability. Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging: comedi (me4000): use PCI_DEVICE() macroJavier Martinez Canillas2010-08-311-15/+14
| | | | | | | | | | | | | | Use PCI_DEVICE() macro for pci table entries on comedi driver and thus improves readability. Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging: comedi (cb_pcimdas): use PCI_DEVICE() macroJavier Martinez Canillas2010-08-311-4/+2
| | | | | | | | | | | | | | Use PCI_DEVICE() macro for pci table entries on comedi driver and thus improves readability. Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging: comedi (adv_pci_dio): use PCI_DEVICE() macroJavier Martinez Canillas2010-08-311-15/+14
| | | | | | | | | | | | | | Use PCI_DEVICE() macro for pci table entries on comedi driver and thus improves readability. Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging: comedi (adl_pci6208): use PCI_DEVICE() macroJavier Martinez Canillas2010-08-311-3/+2
| | | | | | | | | | | | | | Use PCI_DEVICE() macro for pci table entries on comedi driver and thus improves readability. Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging: comedi (adl_pci9118): use PCI_DEVICE() macroJavier Martinez Canillas2010-08-311-3/+2
| | | | | | | | | | | | | | Use PCI_DEVICE() macro for pci table entries on comedi driver and thus improves readability. Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging: comedi (skel): use PCI_DEVICE() macroJavier Martinez Canillas2010-08-311-4/+3
| | | | | | | | | | | | | | Use PCI_DEVICE() macro for pci table entries on comedi driver and thus improves readability. Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging: comedi (adv_pci1710): use PCI_DEVICE() macroJavier Martinez Canillas2010-08-311-7/+6
| | | | | | | | | | | | | | Use PCI_DEVICE() macro for pci table entries on comedi driver and thus improves readability. Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging: comedi (adv_pci1723): use PCI_DEVICE() macroJavier Martinez Canillas2010-08-311-3/+2
| | | | | | | | | | | | | | Use PCI_DEVICE() macro for pci table entries on comedi driver and thus improves readability. Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging: comedi (cb_pcidas64): use PCI_DEVICE() macroJavier Martinez Canillas2010-08-311-40/+20
| | | | | | | | | | | | | | Use PCI_DEVICE() macro for pci table entries on comedi driver and thus improves readability. Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging: comedi (dt3000): use PCI_DEVICE() macroJavier Martinez Canillas2010-08-311-9/+8
| | | | | | | | | | | | | | Use PCI_DEVICE() macro for pci table entries on comedi driver and thus improves readability. Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 04:04:58 +0000