Commit Graph

785 Commits

Author SHA1 Message Date
Greg Kroah-Hartman
e3752a1dfd Staging: comedi: quatech_daqp_cs.c: fix up the irq
The irq needs to return the correct type.  Also fix up some other
sparse warnings that were found.

Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:36:07 -07:00
Greg Kroah-Hartman
ad2d4714a5 Staging: comedi: addi_amcc_s5933.h: sparse cleanup
Mark a variable static that does not need to be global.

Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:36:07 -07:00
Greg Kroah-Hartman
2f78c64255 Staging: comedi: addi_common.c: sparse cleanups
Now that we are properly marking the variable as __iomem, don't
cast it.

Also fix up some other sparse warnings.

Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:36:07 -07:00
Greg Kroah-Hartman
6dd2281464 Staging: comedi: addi_common.h: properly mark this variable as __iomem
It's not an unsigned long, it's a __iomem pointer, so mark it as
such.

Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:36:07 -07:00
Greg Kroah-Hartman
643a5420f1 Staging: comedi: usbduxfast.c: mark a function static
It does not need to be global.

Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:36:07 -07:00
Greg Kroah-Hartman
135998cc00 Staging: comedi: 8255.c: mark some functions static
sparse pointed out that these functions should be static, so mark them
as such.

Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:36:07 -07:00
Greg Kroah-Hartman
30162d690c Staging: comedi: mark a variable as __user
This is really a userspace pointer, so mark it as such.

Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:36:07 -07:00
Greg Kroah-Hartman
92d0127c9d Staging: comedi: __user markup on comedi_fops.c
Hm, what a mess.  I tried to properly mark up the __user pointers,
but for some of these structures, we use them both in the kernel,
and across the user/kernel boundry, which isn't ok.  So we end
up generating a few new sparse warnings in places we were not before,
but the large majority of things are now properly tagged in the fops
file.

The whole ioctl interface needs to be carefully looked at in the future.

Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:36:03 -07:00
Greg Kroah-Hartman
7029a87455 Staging: comedi: drivers.c sparse cleanup
Fix up some sparse issues in drivers.c

Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:36:03 -07:00
Greg Kroah-Hartman
3b6b25b5dd Staging: comedi: range.c: properly mark up __user pointers
This is the start of cleaning up the user pointer markings
in the comedi core.

Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:36:03 -07:00
Greg Kroah-Hartman
2434358ac7 Staging: comedi: move some more functions to internal.h
Only the internal comedi core calls these, so put them here.

Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:36:03 -07:00
Greg Kroah-Hartman
22d114248b Staging: comedi: clean up sparse issues in proc.c
The whole file should be converted to use seqfile, if it's even
still needed.  Or move to debugfs.

Anyway, I fixed up the minor issues here.

Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:36:03 -07:00
Greg Kroah-Hartman
09372df0df Staging: comedi: make comedi_reset_async_buf local to comedi core
No one outside of the comedi core calls this function, so don't export
it to the world.

Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:36:03 -07:00
Greg Kroah-Hartman
9e8c604821 Staging: comedi: make comedi_free_board_minor local to comedi core
No one outside of the comedi core calls this function, so don't export
it to the world.

Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:36:03 -07:00
Greg Kroah-Hartman
242e7ad91a Staging: comedi: make comedi_alloc_board_minor local to comedi core
No one outside of the comedi core calls this function, so create
an internal.h file to put the prototype in, and don't export
it to the world.

Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:36:03 -07:00
Greg Kroah-Hartman
181bd67bf5 Staging: comedi: make comedi_set_subdevice_runflags() static
No one calls this anymore, except the core comedi code, so
mark it static and don't export it.

Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:36:03 -07:00
Greg Kroah-Hartman
472dfe77b9 Staging: comedi: kcomedilib: make it typesafe
If we really are passing in a struct comedi_device, then say we are,
don't mess around with void pointers for no reason.

This also fixes up the comedi_bond.c driver, which is the only
user of the kcomedilib code.

Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:36:02 -07:00
Greg Kroah-Hartman
3781bc5425 Staging: comedi: kcomedilib: simplify comedi_do_insn()
Now that we know we are only making 2 different types of instructions,
only handle those two types.

Also make the call a bit more typesafe by passing the correct pointer
type.

Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:36:02 -07:00
Greg Kroah-Hartman
88cccef019 Staging: comedi: kcomedilib: comedi_do_insn is now static
No one else calls this function, so mark it static.
Now we can strip out the unneeded functionality in here as well.

Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:36:02 -07:00
Greg Kroah-Hartman
a1525758c8 Staging: comedi: kcomedilib: delete dio.c and get.c
Merge these two files into kcomedilib_main.c as they are tiny.

This will also let us get rid of another global symbol in the future.

Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:36:02 -07:00
Greg Kroah-Hartman
6b18af18d2 Staging: comedi: kcomedilib: kcomedilib_main.c: remove unused functions
Remove the unused functions from the kcomedilib_main.c file as they are
not needed.

Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:36:02 -07:00
Greg Kroah-Hartman
c9f7725701 Staging: comedi: kcomedilib: dio.c: remove unused functions
Remove the unused functions from the dio.c file as they are not
needed.

Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:36:02 -07:00
Iain Churcher
3b9fdcd5e8 Staging: comedi: Fix all checkpatch.pl issues in dt2811.c
Patch resolves all checkpatch.pl isues in dt2811.c

Signed-off-by: Iain Churcher <iain.linux.coding@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:36:02 -07:00
Mark Rankilor
aad4029a49 Staging: comedi: Adjusted some long line lengths in drivers.c
This patch fixes some long line lengths in drivers.c that checkpatch.pl was
complaining about

Signed-off-by: Mark Rankilor <reodge@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:36:02 -07:00
Mark Rankilor
f0f29184d8 Staging: comedi: Moved some EXPORT_SYMBOL() macros
This is a patch to range.c that rearranges some EXPORT_SYMBOL() macros to please
checkpatch.pl

Signed-off-by: Mark Rankilor <reodge@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:36:01 -07:00
Iain Churcher
b8c623e5dd Staging: comedi: Fix Checkpatch.pl issues in mpc624.c
This patch resolves all checkpatch.pl issues in the mpc624.c file

Signed-off-by: Iain Churcher <iain.linux.coding@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:36:01 -07:00
Greg Kroah-Hartman
8a9e77b665 Staging: comedi: clean up kcomedilib/get.c
Remove all of the unused functions, leaving only those that are
actually called by in-kernel code.

Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:36:00 -07:00
Greg Kroah-Hartman
29a915ff65 Staging: comedi: delete kcomedilib/data.c
No one is using any of these functions, so remove the file entirely.

Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:36:00 -07:00
Greg Kroah-Hartman
027d53bc2f Staging: comedi: remove unused functions from comedilib.h
Remove the functions that are not used from this file.  Now it will
be easier to determine what code can be removed from kcomedilib by
using sparse.

Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:36:00 -07:00
Greg Kroah-Hartman
e2a0eab0a1 Staging: comedi: move an include file out of comedlib.h
The one .c file that needs it can properly include it.

Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:36:00 -07:00
Greg Kroah-Hartman
703f5936e2 Staging: comedi: clean up comedilib.h
Remove a whole #ifdef section that is not needed anymore.

Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:36:00 -07:00
Greg Kroah-Hartman
7382e5711f Staging: comedi: kcomedilib: remove ksyms.c file
Move only the exports that we actually use into the individual
files, and delete the ksyms.c file entirely.  This will make it
easier to start cleaning up kcomedilib (i.e. delete most of it.)

Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:36:00 -07:00
Greg Kroah-Hartman
4bf935596b Staging: comedi: remove comedi_ksyms.c
Move the 4 remaining exports to their function location
and then remove the comedi_ksyms.c file, as it's no longer
needed.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:36:00 -07:00
Greg Kroah-Hartman
0fd0ca75fd Staging: comedi: rename check_chanlist to comedi_check_chanlist
It's a global function, so properly name it and move the
export to where the function is located at.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:36:00 -07:00
Greg Kroah-Hartman
e42315177d Staging: comedi: more EXPORT_SYMBOL movement
Move the exports for the variables that are in range.c into the
file itself.  These variables should be prefixed with comedi_ but
that's for a different patch...

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:36:00 -07:00
Greg Kroah-Hartman
18736438ae Staging: comedi: more EXPORT_SYMBOL movement
This moves the markings to the comedi_fops.c file, where
they belong.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:36:00 -07:00
Greg Kroah-Hartman
d58214b0b8 Staging: comedi: move a bunch of EXPORT_SYMBOL lines
Move the ones that are needed to be in drivers.c into the
file.  This is with the goal of deleting the comedi_ksyms.c
file.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:35:59 -07:00
Greg Kroah-Hartman
d20cf2feaf Staging: comedi: comedi_ksysms: remove commented out symbols
These aren't needed, they are commented out, so remove them.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:35:59 -07:00
Greg Kroah-Hartman
6608224c9e Staging: comedi: remove another vendor id
This id was already in the drivers, so just use it there
instead of in a common header file.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:35:59 -07:00
Greg Kroah-Hartman
59af888d6a Staging: comedi: move another pci vendor id
Move the vendor id to the drivers needing it.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:35:59 -07:00
Greg Kroah-Hartman
558587e2d9 Staging: comedi: move another pci device id to the driver
Put a pci vendor id into the drivers that need them.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:35:58 -07:00
Greg Kroah-Hartman
3ca88dd5c3 Staging: comedi: move a pci vendor id
The vendor id should be in the driver that needs it, not in
a common file.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:35:58 -07:00
Greg Kroah-Hartman
7a102e0ef1 Staging: comedi: remove some pci vendor ids
These are never used, so remove them.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:35:58 -07:00
Greg Kroah-Hartman
4e40cee9c8 Staging: comedi: use the standard NI pci device id
Don't redefine something that we already have in the core
kernel.  Also move to use PCI_DEVICE() macros to make things
a bit simpler when changing the define.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:35:58 -07:00
Greg Kroah-Hartman
dc1da7f7ba Staging: comedi: fix up remaining coding style issue in proc.c
Move the external variable into a .h file, where it belongs.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:35:58 -07:00
Greg Kroah-Hartman
be29eac8ed Staging: comedi: remove wrapper.h
Just make the bit call when it is needed, no need to wrap
things up like this for no reason.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:35:58 -07:00
Greg Kroah-Hartman
47c9285844 Staging: comedi: remove local pci_ids.h file
It's only being used for one vendor id, so move it into
the driver that uses it and delete the file.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:35:58 -07:00
Greg Kroah-Hartman
8e81f184d9 Staging: comedi: fix up coding issues in proc.c
Fixes all but one.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:35:58 -07:00
Greg Kroah-Hartman
ecfe20db3e Staging: comedi: fix up coding style issues in range.c
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:35:58 -07:00
Greg Kroah-Hartman
787ae4e26f Staging: comedi: remove unneeded ifdef in comedi_bond.c
No need to check for MODULE_LICENSE, it's always there.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:35:57 -07:00