summaryrefslogtreecommitdiffstats
path: root/drivers/staging/comedi
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6Linus Torvalds2010-08-067-265/+114
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: pcmcia: avoid buffer overflow in pcmcia_setup_isa_irq pcmcia: do not request windows if you don't need to pcmcia: insert PCMCIA device resources into resource tree pcmcia: export resource information to sysfs pcmcia: use struct resource for PCMCIA devices, part 2 pcmcia: remove memreq_t pcmcia: move local definitions out of include/pcmcia/cs.h pcmcia: do not use io_req_t when calling pcmcia_request_io() pcmcia: do not use io_req_t after call to pcmcia_request_io() pcmcia: use struct resource for PCMCIA devices pcmcia: clean up cs.h pcmcia: use pcmica_{read,write}_config_byte pcmcia: remove cs_types.h pcmcia: remove unused flag, simplify headers pcmcia: remove obsolete CS_EVENT_ definitions pcmcia: split up central event handler pcmcia: simplify event callback pcmcia: remove obsolete ioctl Conflicts in: - drivers/staging/comedi/drivers/* - drivers/staging/wlags49_h2/wl_cs.c due to dev_info_t and whitespace changes
| * pcmcia: do not request windows if you don't need toDominik Brodowski2010-08-033-68/+3
| | | | | | | | | | | | | | | | | | | | Several drivers contained dummy code to request for memory windows, even though they never made use of it. Remove all such code snippets. CC: netdev@vger.kernel.org CC: linux-wireless@vger.kernel.org Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
| * pcmcia: remove memreq_tDominik Brodowski2010-08-033-12/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Page already had to be set to 0; Offset can easily be passed as parameter to pcmcia_map_mem_page. CC: netdev@vger.kernel.org CC: linux-wireless@vger.kernel.org CC: linux-ide@vger.kernel.org CC: linux-usb@vger.kernel.org CC: laforge@gnumonks.org CC: linux-mtd@lists.infradead.org CC: linux-bluetooth@vger.kernel.org CC: alsa-devel@alsa-project.org CC: linux-serial@vger.kernel.org CC: Michael Buesch <mb@bu3sch.de> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
| * pcmcia: do not use io_req_t when calling pcmcia_request_io()Dominik Brodowski2010-08-037-84/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of io_req_t, drivers are now requested to fill out struct pcmcia_device *p_dev->resource[0,1] for up to two ioport ranges. After a call to pcmcia_request_io(), the ports found there are reserved, after calling pcmcia_request_configuration(), they may be used. CC: netdev@vger.kernel.org CC: linux-wireless@vger.kernel.org CC: linux-ide@vger.kernel.org CC: linux-usb@vger.kernel.org CC: laforge@gnumonks.org CC: linux-mtd@lists.infradead.org CC: alsa-devel@alsa-project.org CC: linux-serial@vger.kernel.org CC: Michael Buesch <mb@bu3sch.de> Acked-by: Marcel Holtmann <marcel@holtmann.org> (for drivers/bluetooth/) Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
| * pcmcia: do not use io_req_t after call to pcmcia_request_io()Dominik Brodowski2010-08-037-43/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After pcmcia_request_io(), do not make use of the values stored in io_req_t, but instead use those found in struct pcmcia_device->resource[]. CC: netdev@vger.kernel.org CC: linux-wireless@vger.kernel.org CC: linux-ide@vger.kernel.org CC: linux-usb@vger.kernel.org CC: laforge@gnumonks.org CC: linux-mtd@lists.infradead.org CC: alsa-devel@alsa-project.org CC: linux-serial@vger.kernel.org Acked-by: Marcel Holtmann <marcel@holtmann.org> (for drivers/bluetooth/) Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
| * pcmcia: remove cs_types.hDominik Brodowski2010-07-307-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove cs_types.h which is no longer needed: Most definitions aren't used at all, a few can be made away with, and two remaining definitions (typedefs, unfortunatley) may be moved to more specific places. CC: linux-ide@vger.kernel.org CC: linux-usb@vger.kernel.org CC: laforge@gnumonks.org CC: linux-mtd@lists.infradead.org CC: alsa-devel@alsa-project.org CC: linux-serial@vger.kernel.org Acked-by: Marcel Holtmann <marcel@holtmann.org> (for drivers/bluetooth/) Acked-by: David S. Miller <davem@davemloft.net> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
* | Staging: Merge staging-next into Linus's treeGreg Kroah-Hartman2010-08-05127-1352/+3983
|\ \ | |/ |/| | | | | | | | | | | | | | | | | Conflicts: drivers/staging/Kconfig drivers/staging/batman-adv/bat_sysfs.c drivers/staging/batman-adv/device.c drivers/staging/batman-adv/hard-interface.c drivers/staging/cx25821/cx25821-audups11.c Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: fix typos concerning "address"Uwe Kleine-König2010-07-225-8/+8
| | | | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging: comedi: formatting of pointers in printk()Kulikov Vasiliy2010-07-221-1/+1
| | | | | | | | | | | | | | Use %p instead of %08x in printk(). Signed-off-by: Kulikov Vasiliy <segooon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: comedi: Cleanup style issues in adl_pci9111.cMark2010-07-221-25/+35
| | | | | | | | | | | | | | This patch fixes some coding style issues in adl_pci9111.c from checkpatch.pl Signed-off-by: Mark Rankilor <reodge@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: comedi: pcm3724: remove casts from void*Kulikov Vasiliy2010-07-081-1/+1
| | | | | | | | | | | | | | Remove unnesessary casts from void*. Signed-off-by: Kulikov Vasiliy <segooon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: comedi: use for_each_pci_dev()Kulikov Vasiliy2010-07-0822-92/+43
| | | | | | | | | | | | | | Use for_each_pci_dev() to simplify the code. Signed-off-by: Kulikov Vasiliy <segooon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: comedi: Cleanup on dmm32at.c from checkpatch.plMark2010-07-081-20/+25
| | | | | | | | | | | | | | This patch cleans up some style issues in dmm32at.c as found by checkpatch.pl Signed-off-by: Mark Rankilor <reodge@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: comedi: Cleanup adv_pci1710.c from checkpatch.plMark2010-07-081-19/+28
| | | | | | | | | | | | | | This patch cleans up some issues discovered by checkpatch.pl Signed-off-by: Mark Rankilor <reodge@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: comedi: kcomedilib: fix coding style issues in kcomedilib_main.cGustavo Silva2010-07-081-2/+2
| | | | | | | | | | | | | | This is a patch to the kcomedilib_main.c file that fixes up some printk() warning issues. Signed-off-by: Gustavo Silva <silvagustavo@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: comedi: fix over 80 character coding style issue in ni_labpc.cMaurice Dawson2010-07-081-8/+30
| | | | | | | | | | | | | | This is a patch to the ni_labpc.c file that fixes up 80 character 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: Coding style cleanups in adv_pci_dio.cMark2010-06-251-127/+180
| | | | | | | | | | | | | | | | This patch fixes up many coding style issues in adv_pci_dio.c found by checkpatch.pl Signed-off-by: Mark Rankilor <reodge@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: comedi: fix code warnings in s626.cJohn Sheehan2010-06-221-22/+22
| | | | | | | | | | | | | | | | | | | | A patch for s626.c to fix some of the warnings reported by the checkpatch.pl tool, namely, -suspect code indent for conditional statements -please, no space before tabs Signed-off-by: John Sheehan <john.d.sheehan@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: comedi: fix code style errors in s626.cJohn Sheehan2010-06-221-28/+39
| | | | | | | | | | | | | | | | | | | | | | A patch for s626.c to fix errors reported by checkpatch.pl tool, namely, -code indent should use tabs where possible -"foo * bar" should be "foo *bar" -trailing statements should be on next line Signed-off-by: John Sheehan <john.d.sheehan@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: don't use custom hex_to_bin() implementationAndy Shevchenko2010-06-221-8/+9
| | | | | | | | | | Signed-off-by: Andy Shevchenko <ext-andriy.shevchenko@nokia.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging/trivial: fix typos concerning "initiali[zs]e"Uwe Kleine-König2010-06-221-1/+1
| | | | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: comedi: drivers: fix coding style issues in pcl812.cGustavo Silva2010-06-181-217/+259
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a patch to the pcl812.c file that fixes up the following issues: ERROR: code indent should use tabs where possible x 27 WARNING: line over 80 characters x 37 WARNING: please, no space before tabs x 13 WARNING: braces {} are not necessary for single statement blocks x 2 WARNING: printk() should include KERN_ facility level x 22 WARNING: braces {} are not necessary for any arm of this statement x 5 Signed-off-by: Gustavo Silva <silvagustavo@users.sourceforge.net> Acked-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: Comedi: drivers: Remove comment copied from skel.cIan Abbott2010-06-172-74/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | The dmm32at.c and comedi_bond.c comedi driver files contain an instructional comment block copied over from skel.c about how to format a driver comment block. This comment was modified in skel.c by a previous patch in this series to stop Comedi's 'dump_doc' script treating it as an actual driver comment block. There isn't any need to repeat this comment block in the other source files, so rather than modify it, this patch just removes it from those files. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: comedi: drivers: skel: Add whitespace to example comment blockIan Abbott2010-06-171-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Comedi team have a script 'dump_doc' to extract text from the driver comment block (starting with line 'Driver:') in (most of) the comedi driver source files. This was recently updated to allow and strip off a " * " prefix at the start of each line (well actually, it uses the perl substitution 's/^ ?\* ?//'). The skel.c file contains an instructional comment block about how to format this driver comment block, but the updated 'dump_doc' script mistakenly treats this as a valid driver comment block. This patch adds some extra whitespace to stop the instructional comment block being treated as a valid driver comment block by Comedi's 'dump_doc' script. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: comedi: drivers: das08: Add whitespace to driver comment blockIan Abbott2010-06-171-5/+5
| | | | | | | | | | | | | | | | | | | | Previous whitespace changes to das08.c removed some whitespace from a "driver comment block" that the Comedi team would like to keep. "Header continuation lines" in this comment block should be indented with whitespace. (This is after the " * " at the start of each line.) Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: comedi: drivers: fix coding style issues in quatech_daqp_cs.cGustavo Silva2010-06-171-27/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | This is a patch to the quatech_daqp_cs.c file that fixes up the following issues: ERROR: code indent should use tabs where possible x 1 WARNING: line over 80 characters x 1 WARNING: braces {} are not necessary for single statement blocks x 10 WARNING: printk() should include KERN_ facility level x 6 Signed-off-by: Gustavo Silva <silvagustavo@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: comedi: drivers: fix coding style issues in pcmda12.cGustavo Silva2010-06-171-5/+7
| | | | | | | | | | | | | | This is a patch to the pcmda12.c file that fixes up five printk() warning issues Signed-off-by: Gustavo Silva <silvagustavo@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: comedi: drivers: fix coding style issues in pcl816.cGustavo Silva2010-06-171-83/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a patch to the pcl816.c file that fixes up the following issues: ERROR: code indent should use tabs where possible x 2 WARNING: line over 80 characters x 34 WARNING: please, no space before tabs x 1 WARNING: braces {} are not necessary for single statement blocks x 6 WARNING: printk() should include KERN_ facility level x 15 WARNING: braces {} are not necessary for any arm of this statement x 1 Signed-off-by: Gustavo Silva <silvagustavo@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: comedi: drivers: Fix coding style issues in pcl711.cGustavo Silva2010-06-171-7/+7
| | | | | | | | | | | | | | | | This is a patch to the pcl711.c file that fixes up printk() warning issues. Signed-off-by: Gustavo Silva <silvagustavo@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
OpenPOWER on IntegriCloud