Commit Graph

232023 Commits

Author SHA1 Message Date
Tomas Winkler 1945f939b6 staging/easycap: make oss ops function static in sound_oss.c
1. make oss ops function static
2. move around code so to avid forward declarations
3. move OSS ioclts from ioctl.c to sound_oss.c

Cc: Mike Thomas <rmthomas@sciolus.org>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-25 07:32:54 +08:00
Tomas Winkler 0edbc24c5d staging/easycap: make OSS compilation optional instead of ALSA
OSS is deprecated yet currently it is reported to be more stable
therefore we keep it but make it optional
Revert the conditional compilation:
	add  CONFIG_EASYCAP_OSS and kill EASYCAP_NEEDS_ALSA
move oss-only code from easycap_sound.c to easycap_sound_oss.c

Cc: Mike Thomas <rmthomas@sciolus.org>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-25 07:32:53 +08:00
Tomas Winkler 5c0c6c395e staging/easycap: implement strerror function
Replace long switch statements that just print out errno
with strerror function. It reduces around 700 lines from the code.

The function should be probably dropped at all but leave for now
to not break currently expected debug output.

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-25 07:30:05 +08:00
Tomas Winkler 482cd2d8d8 staging/easycap: easycap.h ident correctly signed_div_result
indent level 1 by tabs

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-25 07:30:05 +08:00
Tomas Winkler e86ba1162f staging/easycap: fix missing backslash in ifdef statement
the backslash was removed by mistake in the patch
'staging:easycap: drop redundant backslashes from the code'
this breaks compilation only when EASYCAP_NEEDS_ALSA is not set

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-25 07:26:56 +08:00
Tomas Winkler 03389996e0 staging: easycap: easycap.h use indentation for first level
replace
struct {
int a;
}

with  more readable

struct {
	int a;
}

Cc: Mike Thomas <rmthomas@sciolus.org>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-25 06:43:06 +08:00
Tomas Winkler d090bf5749 staging: easycap: make functions local to easycap_main.c static
1. remove declarations from the header file
2. rearange code in main.c to reduce number of forward declarations

Cc: Mike Thomas <rmthomas@sciolus.org>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-25 06:43:05 +08:00
Tomas Winkler 02149cf7c7 staging: easycap: group module parameters handling
1. For readability group module parameters handling on one place
2. Introduce kernel config option EASY_DEBUG

Cc: Mike Thomas <rmthomas@sciolus.org>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-25 06:43:05 +08:00
Tomas Winkler 3dbab73312 staging: easycap: use #ifndef __EASYCAP_H_ for header inclusion protection
use common #ifndef __EASYCAP_H_ instead of if (!defined(EASYCAP_H))
for protecting header from double inclusion

Cc: Mike Thomas <rmthomas@sciolus.org>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-25 06:43:04 +08:00
Tomas Winkler b4f63e9a0f staging: easycap: remove redunant headers
place all globals to easycap.h, which is included
by all c-files
easycap_standard: fix declaration vs. definiton conflict

Cc: Mike Thomas <rmthomas@sciolus.org>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-25 06:43:04 +08:00
Tomas Winkler d9e2d5962b staging: easycap: fix sparse warnings :conversion of int to enum
easycap_settings.c:587:58: warning: conversion of
easycap_settings.c:587:58:     unsigned int to
easycap_settings.c:587:58:     int enum v4l2_field
easycap_settings.c:593:63: warning: conversion of
easycap_settings.c:593:63:     unsigned int to
easycap_settings.c:593:63:     int enum v4l2_colorspace

Cc: Mike Thomas <rmthomas@sciolus.org>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-25 06:43:03 +08:00
Tomas Winkler dbf4805ee6 staging: easycap: fix sparse warnings 'Should it be static'
easycap_main.c:41:23: warning: symbol 'easycapdc60_dongle' was not declared. Should it be static?
easycap_main.c:49:22: warning: symbol 'easycap_usb_device_id_table' was not declared. Should it be static?
easycap_main.c:69:30: warning: symbol 'easycap_fops' was not declared. Should it be static?
easycap_main.c:82:29: warning: symbol 'easycap_vm_ops' was not declared. Should it be static?
easycap_main.c:87:25: warning: symbol 'easycap_class' was not declared. Should it be static?
easycap_main.c:95:35: warning: symbol 'v4l2_fops' was not declared. Should it be static?
easycap_main.c:5071:1: warning: symbol 'easycap_module_init' was not declared. Should it be static?
easycap_main.c:5101:1: warning: symbol 'easycap_module_exit' was not declared. Should it be static?
easycap_low.c:45:50: warning: symbol 'stk1160configPAL' was not declared. Should it be static?
easycap_low.c:87:28: warning: symbol 'stk1160configNTSC' was not declared. Should it be static?
easycap_low.c:129:50: warning: symbol 'saa7113configPAL' was not declared. Should it be static?
easycap_low.c:187:28: warning: symbol 'saa7113configNTSC' was not declared. Should it be static?
easycap_ioctl.c:915:5: warning: symbol 'adjust_mute' was not declared. Should it be static?
easycap_settings.c:42:31: warning: symbol 'easycap_standard' was not declared. Should it be static?
easycap_settings.c:312:23: warning: symbol 'easycap_format' was not declared. Should it be static?
easycap_settings.c:607:23: warning: symbol 'easycap_control' was not declared. Should it be static?

Cc: Mike Thomas <rmthomas@sciolus.org>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-25 06:43:03 +08:00
Mike McCormack 8cbe7ae6c1 staging: rtl8192e: Remove unused members from struct Stats
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-25 06:34:45 +08:00
Mike McCormack 941f0d5db4 staging: rtl8192e: Remove unused types and defines
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-25 06:34:44 +08:00
Mike McCormack 3059f2decf staging: rtl8192e: Delete unused and write-only struct members
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-25 06:34:43 +08:00
Mike McCormack 08dcd4166e staging: rtl8192e: Delete dead code
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-25 06:34:43 +08:00
Mike McCormack a2c900bd8a staging: rtl8192e: Delete dead code from header
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-25 06:34:42 +08:00
Mike McCormack 0157a2b932 staging: rtl8192e: Remove member that's always false
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-25 06:34:42 +08:00
Mike McCormack 395aa640a1 staging: rtl8192e: Remove more unused struct members
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-25 06:34:41 +08:00
Mike McCormack 1538ec93d5 staging: rtl8192e: Remove dead code
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-25 06:34:41 +08:00
Mike McCormack 79694ebbe0 staging: rtl8192e: Remove unused members from r8192_priv
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-25 06:34:40 +08:00
Mike McCormack 73dbd9f3a4 staging: rtl8192e: Remove unused code to detect struct tx rings
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-25 06:34:40 +08:00
Mike McCormack ea9dc54ed9 staging: rtl8192e: Remove unused struct members
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-25 06:34:39 +08:00
Mike McCormack 85c876e412 staging: rtl8192e: Delete dead code in ieee80211 lib
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-25 06:34:39 +08:00
Mike McCormack c8881632da staging: rtl8192e: Tidy up function header comments
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-25 06:34:38 +08:00
Mike McCormack bf2c9de43e staging: rtl8192e: Convert cck_txbbgain_ch14_table to a table
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-25 06:34:38 +08:00
Mike McCormack da1f21ff79 staging: rtl8192e: Convert cck_txbbgain_table to a table
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-25 06:34:37 +08:00
Mike McCormack 09ca1dfdcc staging: rtl8192e: Convert txbbgain_table to a table
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-25 06:34:37 +08:00
Mike McCormack 318f591f08 staging: rtl8192e: Delete commented out code
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-25 06:34:36 +08:00
Mike McCormack dc04b462dd staging: rtl8192e: Remove unused DMESGE/W macros
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-25 06:33:35 +08:00
Alexey Khoroshilov e26a755211 Staging: pohmelfs/dir.c: Remove unneeded mutex_unlock() from pohmelfs_rename()
I do not see any reason for the mutex_unlock(&inode->i_mutex); in
pohmelfs_rename().

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-21 12:38:46 -08:00
Naveen Kumar Gaddipati 4ac638b2ce staging: synaptics: Update with the kernel object name of touch device
Update with the kernel object name of touch device for getting
the regulator of the synaptics rmi4 touch device.

Signed-off-by: Naveen Kumar Gaddipati <naveen.gaddipati@stericsson.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-21 12:36:22 -08:00
Ralph Loader 3ec6080e2e staging: Fix some incorrect use of positive error codes.
Use -E... instead of just E... in a few places where negative error
codes are expected by a functions callers.  These were found by grepping
with coccinelle & then inspecting by hand to determine which were bugs.

The staging/cxt1e1 driver appears to intentionally use positive E...
error codes in some places, and negative -E... error codes in others,
making it hard to know which is intended where - very likely I missed
some problems in that driver.

Signed-off-by: Ralph Loader <suckfish@ihug.co.nz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-21 12:35:50 -08:00
Vasiliy Kulikov 01ebd764da staging: cs5535_gpio: check put_user() return code
put_user() may fail, if so return -EFAULT.

Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-21 12:35:14 -08:00
Ian Abbott 2f644ccfc5 staging: comedi: Make INSN_BITS behavior consistent across drivers
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>
2011-01-21 12:35:14 -08:00
Jesper Juhl 7bd74cd0e5 Staging: FT1000: remove duplicate inc of linux/slab.h
linux/slab.h is included twice in ft1000_dnld.c - remove duplicate.

Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-21 12:31:47 -08:00
Peter Huewe 34381c22b0 staging/vt6655: fix sparse warning "obsolete struct initializer"
This patch fixes the sparse warnings
"obsolete struct initializer, use C99 syntax" in vt6655/device_main.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>
2011-01-21 12:31:16 -08:00
Peter Huewe eb83939266 staging/comedi/icp_multi: fix sparse warning "obsolete struct initializer"
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>
2011-01-21 12:31:16 -08:00
Peter Huewe 56aec8de6e staging/comedi/me4000: fix sparse warning "obsolete struct initializer"
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>
2011-01-21 12:31:16 -08:00
Tomas Winkler e8b754ee8f staging: easycap: replace STRINGIZE with __stringify()
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-21 12:29:43 -08:00
Tomas Winkler 5a85807894 staging: easycap: kill EASYCAP_NEEDS_CARD_CREATE
for in-tree driver we can use snd_card_create
for backports to older kernels this can be easily wrapped

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-21 12:29:43 -08:00
Tomas Winkler 1dc6e41825 staging: easycap: drop redunant backslashes from the code
remove \ from the code where C syntex doesnt require it

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-21 12:29:35 -08:00
Tomas Winkler 2a9a05c432 Staging: easycap: fix sparse warnings for module parameters
easycap_main.c:34:5: warning: symbol 'easycap_debug' was not declared. Should it be static?
easycap_main.c:36:5: warning: symbol 'easycap_gain' was not declared. Should it be static?

These two variables actually were declared in several places.
The variables are used in several files.
I've fixed "easycap_debug" so it gets declared in one place only and included properly.
For "easycap_gain" made it static and I created added a
->gain member to the easycap struct.  This seems cleaner than using a
global variable and later on we may make this controlable via sysfs.

Cc:Mike Thomas <rmthomas@sciolus.org>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Acked-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-21 12:27:19 -08:00
Mike Thomas a985591729 staging: easycap: add ALSA support
This is necessary because some distributions are disabling OSS entirely.

Signed-off-by: Mike Thomas <rmthomas@sciolus.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-21 12:25:55 -08:00
Larry Finger b54a28a418 staging: r8712u: Firmware changes for driver
* select FW_LOADER in Kconfig - From: Stefan Lippers-Hollmann <s.l-h@gmx.de>
* declare MODULE_FIRMWARE for r8712u and change to correct directory
* delete 10K line farray.h containing internal firmware

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-21 12:23:55 -08:00
Larry Finger c84a7028cc staging: r8712u: Switch driver to use external firmware from linux-firmware
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-21 12:23:30 -08:00
Larry Finger e3dc896b21 staging: r8712u: Fix sparse message
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-21 12:22:19 -08:00
Roland Stigge 6ddc5fb43e Staging: iio: add driver for MAX517/518/519
IIO Driver for Maxim MAX517, MAX518 and MAX519 DAC

Signed-off-by: Roland Stigge <stigge@antcom.de>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-21 12:20:56 -08:00
Mike Thomas 18545cfd36 Staging: easycap: Make easycap_debug non-static
The parameter easycap_debug appears in macros JOT and JOM and therefore
needs to be visible from all source files.  The easycap_ prefix should
be sufficient to avoid namespace clashes outside the module.

Signed-off-by: Mike Thomas <rmthomas@sciolus.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-21 12:20:56 -08:00
Ben Hutchings 0a8692b534 rtl8192u_usb: Remove built-in firmware images
These firmware images are already unused.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-21 12:19:11 -08:00