Commit Graph
232051 Commits
Author SHA1 Message Date
Joe Perches 391bb2116a staging: ath6kl: Remove A_FAILED macro
Remove obfuscating A_FAILED(foo) macro.
Just test for foo instead.

Signed-off-by: Joe Perches <[email protected]>
Acked-by: Vipin Mehta <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-01-31 13:53:11 -08:00
Joe Perches 509c9d9730 staging: ath6kl: Remove A_SUCCESS macro
Remove obfuscating A_SUCCESS(foo) macro.
Just test for !foo instead.

Reformat a few macros that used A_SUCCESS for better readability.
Add do { foo } while (0) surrounds to those macros too.

Signed-off-by: Joe Perches <[email protected]>
Acked-by: Vipin Mehta <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-01-31 13:53:11 -08:00
Joe Perches 1f4c34bded staging: ath6kl: Convert enum A_STATUS to int
Convert enum members to int as well.

Signed-off-by: Joe Perches <[email protected]>
Acked-by: Vipin Mehta <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-01-31 13:53:11 -08:00
Joe Perches a789325dc3 staging: ath6kl: Update cfg80211 to recent calling convention changes
Add bool unicast and bool multicast to set_default_key
Return struct net_device * to add_virtual_intf

Signed-off-by: Joe Perches <[email protected]>
Acked-by: Vipin Mehta <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-01-31 13:49:55 -08:00
Coly Li d7ddd16933 Staging: wl_cfg80211.c: use BUG_ON correctly
This patch removes explicit unlikely() when using BUG_ON() in
wl_cfg80211.c

Signed-off-by: Coly Li <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-01-31 13:45:42 -08:00
Julia Lawall 3073acd61c staging: msm/lcdc.c: Convert IS_ERR result to PTR_ERR
This code elsewhere returns a negative constant to an indicate an error,
while IS_ERR returns the result of a >= operation.

The semantic patch that fixes this problem is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@@
expression x;
@@

 if (...) { ...
- return IS_ERR(x);
+ return PTR_ERR(x);
}
// </smpl>

Signed-off-by: Julia Lawall <[email protected]>
Acked-by: David Brown <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-01-31 13:44:05 -08:00
Haiyang Zhang da9fcb7260 staging: hv: Convert camel cased struct fields in vmbus_private.h to lower cases
Signed-off-by: Haiyang Zhang <[email protected]>
Signed-off-by: Hank Janssen <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-01-31 13:42:49 -08:00
Haiyang Zhang 415f228712 staging: hv: Convert camel cased struct fields in vmbus_packet_format.h to lower cases
Signed-off-by: Haiyang Zhang <[email protected]>
Signed-off-by: Hank Janssen <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-01-31 13:42:49 -08:00
Haiyang Zhang 767dff6853 staging: hv: Convert camel cased struct fields in vmbus_channel_interface.h to lower cases
Signed-off-by: Haiyang Zhang <[email protected]>
Signed-off-by: Hank Janssen <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-01-31 13:42:49 -08:00
Haiyang Zhang ca623ad355 staging: hv: Convert camel cased struct fields in vmbus_api.h to lower cases
Signed-off-by: Haiyang Zhang <[email protected]>
Signed-off-by: Hank Janssen <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-01-31 13:42:48 -08:00
Haiyang Zhang 646f1ea379 staging: hv: Convert camel cased functions in vmbus_drv.c to lower cases
Signed-off-by: Haiyang Zhang <[email protected]>
Signed-off-by: Hank Janssen <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-01-31 13:42:48 -08:00
Haiyang Zhang adf874cb35 staging: hv: Convert camel cased variables in vmbus_drv.c to lower cases
Signed-off-by: Haiyang Zhang <[email protected]>
Signed-off-by: Hank Janssen <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-01-31 13:42:48 -08:00
Haiyang Zhang c69776771f staging: hv: Convert camel cased functions in connection.c to lower cases
Signed-off-by: Haiyang Zhang <[email protected]>
Signed-off-by: Hank Janssen <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-01-31 13:42:48 -08:00
Haiyang Zhang 15b2f6479b staging: hv: Convert camel cased variables in connection.c to lower cases
Signed-off-by: Haiyang Zhang <[email protected]>
Signed-off-by: Hank Janssen <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-01-31 13:42:47 -08:00
Arnd Bergmann a6238f2173 appletalk: move to staging
For all I know, Appletalk is dead, the only reasonable
use right now would be nostalgia, and that can be served
well enough by old kernels. The code is largely not
in a bad shape, but it still uses the big kernel lock,
and nobody seems motivated to change that.

FWIW, the last release of MacOS that supported Appletalk
was MacOS X 10.5, made in 2007, and it has been abandoned
by Apple with 10.6. Using TCP/IP instead of Appletalk has
been supported since MacOS 7.6, which was released in
1997 and is able to run on most of the legacy hardware.

Signed-off-by: Arnd Bergmann <[email protected]>
Cc: Arnaldo Carvalho de Melo <[email protected]>
Cc: [email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-01-31 13:38:16 -08:00
Arnd Bergmann 939cbe5af5 staging: remove smbfs
smbfs got moved to staging in 2.6.37, so we can
finally remove it in the 2.6.39 merge window.
All users should by now have migrated to cifs.

Signed-off-by: Arnd Bergmann <[email protected]>
Cc: [email protected]
Cc: Jeff Layton <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-01-31 13:38:16 -08:00
Arnd Bergmann 561c5cf923 staging: Remove autofs3
autofs3 was moved to staging in 2.6.37, so we can
remove it in the 2.6.39 merge window. If we have
a reason to bring it back after that, this patch
can get reverted.

Signed-off-by: Arnd Bergmann <[email protected]>
About-fscking-timed-by: H. Peter Anvin <[email protected]>
Cc: Ian Kent <[email protected]>
Cc: [email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-01-31 13:38:15 -08:00
Arnd Bergmann 8aea5882c5 staging/go7007: remove the BKL
There is nothing that the BKL can possibly
protect here, so just remove it.

Cc: Ross Cohen <[email protected]>

Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-01-31 13:38:15 -08:00
Randy Dunlap 27a16811ab staging: fix rts_pstor build errors
Fix multiple rts_pstor build errors.

When CONFIG_PCI is not enabled:

drivers/staging/rts_pstor/rtsx.c: In function 'rtsx_acquire_irq':
drivers/staging/rts_pstor/rtsx.c:324: error: implicit declaration of function 'pci_intx'
drivers/staging/rts_pstor/rtsx.c: In function 'rtsx_read_pci_cfg_byte':
drivers/staging/rts_pstor/rtsx.c:336: error: implicit declaration of function 'pci_get_domain_bus_and_slot'
drivers/staging/rts_pstor/rtsx.c:336: warning: assignment makes pointer from integer without a cast
drivers/staging/rts_pstor/rtsx.c: In function 'rtsx_shutdown':
drivers/staging/rts_pstor/rtsx.c:462: error: implicit declaration of function 'pci_disable_msi'
drivers/staging/rts_pstor/rtsx.c: In function 'rtsx_probe':
drivers/staging/rts_pstor/rtsx.c:981: error: implicit declaration of function 'pci_enable_msi'

When CONFIG_SCSI is not enabled:

In file included from drivers/staging/rts_pstor/rtsx.h:45,
                 from drivers/staging/rts_pstor/rtsx.c:28:
include/scsi/scsi_cmnd.h:27:25: warning: "BLK_MAX_CDB" is not defined
include/scsi/scsi_cmnd.h:28:3: error: #error MAX_COMMAND_SIZE can not be bigger than BLK_MAX_CDB
In file included from drivers/staging/rts_pstor/rtsx.h:45,
                 from drivers/staging/rts_pstor/rtsx.c:28:
include/scsi/scsi_cmnd.h: In function 'scsi_bidi_cmnd':
include/scsi/scsi_cmnd.h:184: error: implicit declaration of function 'blk_bidi_rq'
include/scsi/scsi_cmnd.h:185: error: dereferencing pointer to incomplete type
include/scsi/scsi_cmnd.h: In function 'scsi_in':
include/scsi/scsi_cmnd.h:191: error: dereferencing pointer to incomplete type
include/scsi/scsi_cmnd.h: In function 'scsi_get_lba':  CC      drivers/gpu/drm/nouveau/nv04_tv.o

include/scsi/scsi_cmnd.h:269: error: implicit declaration of function 'blk_rq_pos'
In file included from drivers/staging/rts_pstor/rtsx.h:48,
                 from drivers/staging/rts_pstor/rtsx.c:28:
include/scsi/scsi_eh.h: At top level:
include/scsi/scsi_eh.h:84: error: 'BLK_MAX_CDB' undeclared here (not in a function)
drivers/staging/rts_pstor/rtsx.c: In function 'slave_configure':
drivers/staging/rts_pstor/rtsx.c:107: error: implicit declaration of function 'blk_queue_dma_alignment'

Signed-off-by: Randy Dunlap <[email protected]>
Cc: [email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-01-31 13:35:35 -08:00
Sutharsan Ramamoorthy af109f2e32 Staging: Westbridge: fix EXPORT_SYMBOL errors reported by checkpatch.pl
This patch fixes errors reported by checkpatch.pl
in westbridge device controller driver in the staging tree.
File containing EXPORT_SYMBOL() macros for all the APIs exported
by the westbridge software has been removed. EXPORT_SYMBOL()
macros are added after the corresponding function definitions.

Signed-off-by: Sutharsan Ramamoorthy <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-01-26 15:02:53 +08:00
Greg Kroah-Hartman f5c28f2538 Revert "staging: brcm80211: assure common sources are truly common"
This reverts commit ead1256410 as it
broke the build when building with multiple threads at the same time.

Cc: Brett Rudley <[email protected]>
Cc: Henry Ptasinski <[email protected]>
Cc: Roland Vossen <[email protected]>
Cc: Arend van Spriel <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-01-25 19:07:55 +08:00
Arend van Spriel ead1256410 staging: brcm80211: assure common sources are truly common
Common code for brcm80211 drivers was resulting in different compiled
object files for the drivers due to compilation flags. This has been
aligned so that they are resulting in same object files. Kconfig now
allows both drivers to be build simultaneously.

Reviewed-by: Brett Rudley <[email protected]>
Reviewed-by: Henry Ptasinski <[email protected]>
Reviewed-by: Roland Vossen <[email protected]>
Signed-off-by: Arend van Spriel <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-01-25 18:35:03 +08:00
Nitin Gupta 7d7854b4da Staging: zram: simplify zram_make_request
zram_read() and zram_write() always return zero, so make them return
void to simplify the code.

Signed-off-by: Nitin Gupta <[email protected]>
Signed-off-by: Jerome Marchand <[email protected]>
Acked-by: Jeff Moyer <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-01-25 18:15:24 +08:00
Wolfram Sang dc7b202a4e staging/ste_rmi4: Remove obsolete cleanup for clientdata
A few new i2c-drivers came into the kernel which clear the clientdata-pointer
on exit or error. This is obsolete meanwhile, the core will do it.

Signed-off-by: Wolfram Sang <[email protected]>
Cc: Naveen Kumar Gaddipati <[email protected]>
Cc: Linus Walleij <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-01-25 18:13:01 +08:00
L. Alberto Giménez 5673db40e2 Staging: rt2860: rt_linux.c: Fix space after unary '*' operator.
Fix checkpatch error raised by the use of spaces between the '*' operator and
the corresponding variable name.

Signed-off-by: L. Alberto Giménez <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-01-25 18:03:26 +08:00
L. Alberto Giménez f5041dac6b Staging: rt2860: rt_linux.h: Fix space after unary '*' operator.
Fix checkpatch error raised by the use of spaces between the '*' operator and
the corresponding variable name.

Signed-off-by: L. Alberto Giménez <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-01-25 18:03:26 +08:00
L. Alberto Giménez 6e4e2d9b74 Staging: rt2860: wpa.h: Fix space after unary '*' operator.
Fix checkpatch error raised by the use of spaces between the '*' operator and
the corresponding variable name.

Signed-off-by: L. Alberto Giménez <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-01-25 18:03:25 +08:00
Tomas Winkler 68e4ccaab2 staging/easycap: make ALSA ops function static in sound.c
1. make also ops function static
2. move around code so to avid forward declarations

Cc: Mike Thomas <[email protected]>
Signed-off-by: Tomas Winkler <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-01-25 07:32:54 +08:00
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 <[email protected]>
Signed-off-by: Tomas Winkler <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
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 <[email protected]>
Signed-off-by: Tomas Winkler <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
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 <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
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 <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
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 <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
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 <[email protected]>
Signed-off-by: Tomas Winkler <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
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 <[email protected]>
Signed-off-by: Tomas Winkler <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
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 <[email protected]>
Signed-off-by: Tomas Winkler <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
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 <[email protected]>
Signed-off-by: Tomas Winkler <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
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 <[email protected]>
Signed-off-by: Tomas Winkler <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
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 <[email protected]>
Signed-off-by: Tomas Winkler <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
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 <[email protected]>
Signed-off-by: Tomas Winkler <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-01-25 06:43:03 +08:00
Mike McCormack 8cbe7ae6c1 staging: rtl8192e: Remove unused members from struct Stats
Signed-off-by: Mike McCormack <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-01-25 06:34:45 +08:00
Mike McCormack 941f0d5db4 staging: rtl8192e: Remove unused types and defines
Signed-off-by: Mike McCormack <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
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 <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-01-25 06:34:43 +08:00
Mike McCormack 08dcd4166e staging: rtl8192e: Delete dead code
Signed-off-by: Mike McCormack <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-01-25 06:34:43 +08:00
Mike McCormack a2c900bd8a staging: rtl8192e: Delete dead code from header
Signed-off-by: Mike McCormack <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-01-25 06:34:42 +08:00
Mike McCormack 0157a2b932 staging: rtl8192e: Remove member that's always false
Signed-off-by: Mike McCormack <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-01-25 06:34:42 +08:00
Mike McCormack 395aa640a1 staging: rtl8192e: Remove more unused struct members
Signed-off-by: Mike McCormack <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-01-25 06:34:41 +08:00
Mike McCormack 1538ec93d5 staging: rtl8192e: Remove dead code
Signed-off-by: Mike McCormack <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-01-25 06:34:41 +08:00
Mike McCormack 79694ebbe0 staging: rtl8192e: Remove unused members from r8192_priv
Signed-off-by: Mike McCormack <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
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 <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-01-25 06:34:40 +08:00