Commit Graph

1015 Commits

Author SHA1 Message Date
Jake Burton 963ff7740d Staging: comedi: fix brace coding style issue in ni_atmio.c
This is a patch to the ni_atmio.c file which fixes a brace and whitespace warning found by the checkpatch.pl tool

Signed-off-by: Jake Burton <jake5991@live.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-17 15:11:30 -07:00
Nasir Abed 0bdd2b6207 Staging: comedi: c6xdigio: fixed missing KERN_* in printk
Fixed missing KERN_* in printk statements.

Signed-off-by: Nasir Abed <nasirabed+kernel@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-17 15:11:30 -07:00
Christopher Rice 589cabe1b1 drivers:staging:comedi:drivers:cb_das_cs.c codeing style issue
drivers: staging: comedi: cb_das16_cs.c
fixed over 80 line issue, and removed a space before tab issue.

Signed-off-by: Christopher Rice <rice.christopher.a@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-26 17:43:45 -07:00
Johannes Thumshirn bcd9a1e91f staging: comedi: Added log subjects to printk()s in pcmmio
Added log subject to printk()s in drivers/staging/comedi/drivers/pcmmio.c.

Signed-off-by: Johannes Thumshirn <morbidrsa@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-26 17:43:44 -07:00
Bernd Porr dd89e20d7e staging: comedi: new driver usbduxsigma
This adds a new driver file usbduxsigma which is the driver for
a new board by ITL. The driver has been tested and is working fine.

Signed-off-by: Bernd Porr <berndporr@f2s.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-23 12:00:45 -07:00
Randy Dunlap d6aa8366dd staging: fix comedi build errors
Fix build errors when CONFIG_COMEDI_PCI_DRIVERS is not enabled
and CONFIG_COMEDI_PCI_DRIVERS was used where CONFIG_ISA_DMA_API
should have been used.

drivers/staging/comedi/drivers/ni_labpc.c: In function 'labpc_ai_cmd':
drivers/staging/comedi/drivers/ni_labpc.c:1351: error: implicit declaration of function 'labpc_suggest_transfer_size'
drivers/staging/comedi/drivers/ni_labpc.c: At top level:
drivers/staging/comedi/drivers/ni_labpc.c:1802: error: conflicting types for 'labpc_suggest_transfer_size'
drivers/staging/comedi/drivers/ni_labpc.c:1351: note: previous implicit declaration of 'labpc_suggest_transfer_size' was here

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-23 11:56:47 -07:00
Bojan Prtvar 13a9e03c0c Staging: comedi: fix initialization of static to 0 in ni_pcidio.c
This patch removes initialization of static to 0 or NULL error found
by checkpatch.pl tool

Signed-off-by: Bojan Prtvar <prtvar.b@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-23 11:56:47 -07:00
Mariano Guerra 654e8fb522 Staging: comedi: do not initialise statics to 0 or NULL
This is a patch to adv_pci_dio.c that fixes an error initializing

static struct pci_dio_private *pci_priv to NULL

removed the initialization.
found by the checkpatch.pl tool.

	Signed-off-by: Mariano Guerra <luismarianoguerra@gmail.com>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-23 11:56:47 -07:00
Mark Pearson f5283a4bb8 Staging: comedi: Fixed coding style issues.
comedi_fops.c : A forward decleration was declared as extern although it
                is a function private to this file. Changed the
                decleration to static.

Signed-off-by: Mark Pearson <markpearson_de@yahoo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-23 11:56:46 -07:00
Ravishankar 6e882d472f Staging: comedi: fix printk issue in rtd520.c
This is a patch to the rtd520.c file that fixes up a printk  warning found by the checkpatch.pl tool

Signed-off-by: Ravishankr <ravishakarkm32@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-08 14:11:18 -07:00
Ravishankar 7a98161646 Staging: comedi: fix line over 80 character issue in rtd520.c
This is a patch to the rtd520.c file that fixes up a  warning: line over 80 character found by the checkpatch.pl tool

Signed-off-by: Ravishankar <ravishankarkm32@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-08 14:11:17 -07:00
Ravishankar 33e73e0085 Staging: comedi: fix warning issue in unioxx5.c
This is a patch to the unioxx5.c file that fixes up a  warning found by the checkpatch.pl tool

Signed-off-by: Ravishankar <ravishankarkm32@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-08 13:59:55 -07:00
Ravishankar e9d1cf89ed Staging: comedi: fix brace coding style issue in serial2002.c
This is a patch to the serial2002.c file that fixes up a brace warning found by the checkpatch.pl tool

Signed-off-by: Ravishankar <ravishankarkm32@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-08 13:59:54 -07:00
Ravishankar b041267ea8 Staging: comedi: fix brace and printk coding style issue in serial2002.c
This is a patch to the serial2002.c file that fixes up a brace and printk  warning found by the checkpatch.pl tool

Signed-off-by: Ravishankar <ravishankarkm32@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-08 13:59:54 -07:00
Pavel Roskin 0435f9337f staging: comedi: remove COMEDI_DEVICE_CREATE macro, expand all callers
This is no longer needed as the code is now in the main kernel tree.

Signed-off-by: Pavel Roskin <proski@gnu.org>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-06 08:22:49 -07:00
Matthew Skolaut a142785d7c Staging: comedi: das1800: fixed multiple brace coding style issues and pointer declaration style errors
Fixed coding style issues

Signed-off-by: Matthew Skolaut <tech2077@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05 09:40:30 -07:00
Ravishankar ee4d07d8e1 Staging: comedi: fix prink warning style issue in ni_daq_700.c
This is a patch to the ni_daq_700.c file that fixes up a prink  warning found by the checkpatch.pl tool

Signed-off-by: Ravishankar <ravishankarkm32@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05 09:40:30 -07:00
Randy Dunlap 3297d6c7c8 staging: fix comedi NI labpc driver build when ISA_DMA_API is not enabled
Fix ni_labpc.c to build when CONFIG_ISA_DMA_API is not enabled.

This is a driver that supports both ISA and PCI devices.
It now builds when for PCI-only support or for both
ISA and PCI device support.
(It does not support ISA-only without PCI.)

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05 09:24:18 -07:00
Vasiliy Kulikov 819cbb120e staging: comedi: fix infoleak to userspace
driver_name and board_name are pointers to strings, not buffers of size
COMEDI_NAMELEN.  Copying COMEDI_NAMELEN bytes of a string containing
less than COMEDI_NAMELEN-1 bytes would leak some unrelated bytes.

Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05 09:24:18 -07:00
Dan Carpenter 85678d5d27 Staging: comedi: usbdux: release locks on error paths
Smatch complains about a couple error paths where the semaphores
were not released.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05 09:24:18 -07:00
Prashant P. Shah 880e96166c Staging: comedi: add dyna_pci10xx driver to Makefile
Add dyna_pci10xx entry to comedi Kconfig and Makefile

Signed-off-by: Prashant P. Shah <pshah.mumbai@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05 09:24:18 -07:00
Prashant P. Shah 16a7373a8e Staging: comedi: add dyna_pci10xx driver
For Dynalog PCI DAQ cards:
  PCI-1050

Signed-off-by: Prashant P. Shah <pshah.mumbai@gmail.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05 09:24:17 -07:00
Greg Kroah-Hartman 0c9e98af5e Merge Linux 3.0-rc6 into staging-next
This handles the merge conflicts with the
drivers/staging/brcm80211/Kconfig file due to changes on the two
different branches.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05 07:35:09 -07:00
Matt Billenstein 2d32f74622 staging: comedi (adv_pci1723): coding style, fix whitespace before quoted newline
Small fix in adv_pci1723.c for a "whitespace before quoted newline" warning
from checkpatch.pl

Signed-off-by: Matt Billenstein <matt@vazor.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-28 13:27:20 -07:00
Ralf Thielow f80d1d22b6 staging: comedi: fixed a declaration coding style issue
Fixed a declaration coding style issue.

Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-28 13:23:56 -07:00