Commit graph

3267 commits

Author SHA1 Message Date
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
Joe Perches
e6e4d05d4d Staging: cxt1e1: fix cxt1e1 module names
On Mon, 2010-05-03 at 10:09 -0700, Randy Dunlap wrote:
> Lots of cxt1e1 source code uses THIS_MODULE->name, which won't build
> when CONFIG_MODULES is not enabled, so use KBUILD_MODNAME instead.

Perhaps a conversion to pr_<level> is better?

Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
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
Charles Clément
3b87d0aa35 Staging: crystalhd: remove unused #include <linux/version.h>
Signed-off-by: Charles Clément <caratorn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:36:01 -07:00
Charles Clément
4752e51a1d Staging: crystalhd: Cleanup all WIN* references
Signed-off-by: Charles Clément <caratorn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:36:01 -07:00
Javier Martinez Canillas
4212c68638 Staging: adis16255: Fix compile error
This patch solves a compilation error in today linux-next tree.

The adis16255 staging driver Makefile seems to be wrong. I think this patch solves the issue.

Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:36:01 -07:00
Lars Lindley
92f2a4c58f Staging: winbond: Renamed README to TODO and corrected Pavel's mail
Signed-off-by: Lars Lindley <lindley@coyote.org>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:36:01 -07:00
Andres More
e7b07d1d89 Staging: vt6656: code cleanup, fixed comments style at the end of headers
Signed-off-by: Andres More <more.andres@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:36:01 -07:00
Andres More
8611a29ab9 Staging: vt6656: removed VOID/PVOID definitions
Warnings about the usage of externs in .c files were not resolved here.

Signed-off-by: Andres More <more.andres@gmail.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
Linus Lüssing
ea4ceb18b5 Staging: batman-adv: Fixing wrap-around bug in vis
When the seqno for a vis packet had a wrap around from i.e. 255 to 0,
add_packet() would falsely claim the older packet with the seqno 255 as
newer as the one with the seqno of 0 and would therefore ignore the new
packet. This happens with all following vis packets until the old vis
packet expires after 180 seconds timeout. This patch fixes this issue
and gets rid of these highly undesired 3min. breaks for the vis-server.

Signed-off-by: Linus Lüssing <linus.luessing@web.de>
Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:35:59 -07:00
Linus Lüssing
f6497e38fd Staging: batman-adv: Fix VIS output bug for secondary interfaces
TQ and HNA records for originators on secondary interfaces were
wrongly being included on the primary interface. Ensure we output a
line for each source interface on every node, so we correctly separate
primary and secondary interface records.

Signed-off-by: Linus Lüssing <linus.luessing@web.de>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:35:59 -07:00
Andrew Lunn
107c32fe68 Staging: batman-adv: don't have interrupts disabled while sending.
send_vis_packets() would disable interrupts before calling
dev_queue_xmit() which resulting in a backtrace in local_bh_enable().
Fix this by using kref on the vis_info object so that we can call
send_vis_packets() without holding vis_hash_lock. vis_hash_lock also
used to protect recv_list, so we now need a new lock to protect that
instead of vis_hash_lock.

Also a few checkpatch cleanups.

Reported-by: Linus Lüssing <linus.luessing@web.de>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Signed-off-by: Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:35:59 -07:00
Greg Kroah-Hartman
11d91a4456 Staging: dt3155v4l: add driver to the build
The last patch forgot to add the driver to the Makefile, so it
would not end up getting built.  This resolves that issue.

Cc: Marin Mitov <mitov@issp.bas.bg>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:35:59 -07:00
Marin Mitov
d42bffb899 Staging: Yet another (third) dt3155 driver PCI/video4linux compliant
Kernel module (device driver) for dt3155 frame grabber
video4linux2 compliant (finally). Works with "xawtv -f".

======================================================

This driver is written (almost) from scratch, using the
allocator developed for dt3155pci see bellow). The driver
uses videobuf-dma-contig interface modified to use the above
mentioned allocator instead of dma_alloc_coheren().

The first thing to do was to design a new allocator based
on allocating a configurable number of 4MB chunks of memory,
that latter are broken into frame buffers of 768x576 bytes
kept in different FIFOs (queues). As far as the driver autoloads
as a kernel module during kernel boot, the allocation of 4MB
chunks succeeds.

The driver keeps three FIFOs: one for 4MB chunks, one for free
buffers (available for allocations) and one for buffers already
allocated. Allocation/deallocation is done automatically though
the video4linux videobuf subsystem (some pointers to functions
are replaced by driver supplied functions).

Sure, there are problems:

1. The device tested to work with "xawtv -f" either via read()
   method (DT3155_STREAMING not selected), or via mmap() method
   (DT3155_STREAMING is selected) only. This coresponds to either
   cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE;
   or
   cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;
   but not when
   cap->capabilities = V4L2_CAP_VIDEO_CAPTURE |
                           V4L2_CAP_STREAMING |
                           V4L2_CAP_READWRITE;
   This is because xawtv calls poll() before starting streaming,
   but videobuf_poll_stream() automatically starts reading if streaming
   is not started.
   This selection is made during kernel configuration (for now).

2. Works for CCIR, but should work for RS-170 (not tested)
   This is made also during kernel configuration.

3. Could work for multiple dt3155 frame grabbers in a PC,
   (private data is allocated during PCI probe() method), but
   is not tested due to lack of a second board.

4. Not tested on a BIG ENDIAN architecture.

5. Many others you could find .... :-)

All critics, comments, suggestions are wellcome.

Signed-off-by: Marin Mitov <mitov@issp.bas.bg>
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
Greg Kroah-Hartman
baf22b64aa Staging: comedi: fix coding style issues in comedidev.h
This resolves some coding style issues in comedidev.h

And yes, volatile here meant nothing, removing it is ok.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:35:57 -07:00
Greg Kroah-Hartman
981bdf41ea Staging: comedi: fix up coding style issues in comedilib.h
This resolves some issues with comedilib.h

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:35:57 -07:00
Randy Dunlap
d87d909a45 Staging: cxt1e1: use netdev_priv to fix build
Fix cxt1e1 build error:
drivers/staging/cxt1e1/linux.c:1195: error: 'struct net_device' has no member named 'priv'

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Acked-by: Bob Beers <bob.beers@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:35:57 -07:00
Roel Van Nyen
c849d2538e Staging: iio: Fix remaining code style issues
fix code style issues

Signed-of-by: Roel Van Nyen <roel.vannyen@gmail.com>
Cc: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:35:57 -07:00
Iain Churcher
18e7e78e94 Staging: comedi: numerous checkpatch.pl issues in dt282x.c
This patch cleans up numerous WARNINGS and ERRORS listed by the
checkpatch.pl tool

Signed-off-by: Iain Churcher <iain.linux.coding@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:35:57 -07:00