]>
git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/log
Joe Perches [Tue, 14 Dec 2010 00:57:03 +0000 (16:57 -0800)]
staging: brcm80211: Remove unused ETHER_TYPE_<foo> #defines
Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Joe Perches [Tue, 14 Dec 2010 00:57:02 +0000 (16:57 -0800)]
staging: brcm80211: Remove ETHER_HDR_LEN, use ETH_HLEN
Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Joe Perches [Tue, 14 Dec 2010 00:57:01 +0000 (16:57 -0800)]
staging: brcm80211: Convert ETHER_ADDR_LEN to ETH_ALEN
Add an #include of <linux/if_ether.h> to include/proto/ethernet.h
Convert ETHER_ADDR_LEN, remove the #define for ETHER_ADDR_LEN.
Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Joe Perches [Tue, 14 Dec 2010 00:57:00 +0000 (16:57 -0800)]
staging: brcm80211: Convert ETHER_IS<FOO> to is_<foo>_ether_addr
Use the normal kernel calls and remove the #defines
for ETHER_IS_BCAST and ETHER_IS_NULLADDR.
Add #include for etherdevice.h where necessary.
Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Joe Perches [Tue, 14 Dec 2010 00:56:59 +0000 (16:56 -0800)]
staging: brcm80211: Remove unused ether_<foo> #defines and struct
These are unused, just remove them.
Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Joe Perches [Tue, 14 Dec 2010 00:56:58 +0000 (16:56 -0800)]
staging: brcm80211: Convert ETHER_IS_MULTI to is_multicast_ether_addr
Use the standard kernel function.
Change callers to add .octet to addressing to avoid warnings.
Add #include <linux/etherdevice.h> where necessary.
Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Joe Perches [Tue, 14 Dec 2010 00:56:57 +0000 (16:56 -0800)]
staging: brcm80211: Remove unused #defines ETHER_<foo>_LOCALADDR
Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Xenofon Foukas [Wed, 15 Dec 2010 17:44:20 +0000 (19:44 +0200)]
Staging: comedi: Fix checkpatch.pl issues in file s526.c
This patch fixes the following issues in s526.c:
WARNING: printk() should include KERN_ facility level
WARNING: line over 80 characters
ERROR: do not use C99 // comments
WARNING: space prohibited between function name and open parenthesis '('
WARNING: braces {} are not necessary for any arm of this statement
WARNING: suspect code indent for conditional statements (16, 16)
Signed-off-by: Xenofon Foukas <foukas.xenofon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Xenofon Foukas [Tue, 14 Dec 2010 22:14:30 +0000 (00:14 +0200)]
Staging: comedi: Fix coding style issues in ii_pci20kc.c
This patch fixes the following issues in file ii_pci20kc.c:
WARNING: please, no space before tabs
WARNING: unnecessary whitespace before a quoted newline
WARNING: line over 80 characters
Signed-off-by: Xenofon Foukas <foukas.xenofon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Tue, 14 Dec 2010 13:02:55 +0000 (14:02 +0100)]
staging: ft1000: Fix kernel panic when use ioctl.
During ioctl testing was observed kernel panic beuase
file->private_data pointer was not correctly set when
debugfs file was created. Add correct pointer setup.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Tue, 14 Dec 2010 13:02:54 +0000 (14:02 +0100)]
staging: ft1000: Fix camelcase variable names.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Tue, 14 Dec 2010 08:42:28 +0000 (09:42 +0100)]
staging: ft1000: Rename ft1000_chdev.c to ft1000_debug.c.
Name of old file was misleading because it is currently
updated to debugfs so change also file name.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Tue, 14 Dec 2010 08:42:27 +0000 (09:42 +0100)]
staging: ft1000: Fix camelcase function names.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
L. Alberto Giménez [Tue, 14 Dec 2010 01:01:55 +0000 (02:01 +0100)]
Staging: rt2860: Sanitize DBGPRINT_ERR macro
Cleaner implementation. Avoids the need of the double parenthesis to call the
macro.
Signed-off-by: L. Alberto Giménez <agimenez@sysvalve.es>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
L. Alberto Giménez [Tue, 14 Dec 2010 01:01:54 +0000 (02:01 +0100)]
Staging: rt2860: include KERN_* in printk
Fix checkpatch complains.
Signed-off-by: L. Alberto Giménez <agimenez@sysvalve.es>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Haiyang Zhang [Fri, 10 Dec 2010 20:04:00 +0000 (12:04 -0800)]
staging: hv: Convert camel cased struct fields in rndis.h to lower cases
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Haiyang Zhang [Fri, 10 Dec 2010 20:03:59 +0000 (12:03 -0800)]
staging: hv: Convert camel cased struct fields in netvsc.h to lower cases
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Haiyang Zhang [Fri, 10 Dec 2010 20:03:58 +0000 (12:03 -0800)]
staging: hv: Convert camel cased struct fields in netvsc_api.h to lower cases
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Haiyang Zhang [Fri, 10 Dec 2010 20:03:57 +0000 (12:03 -0800)]
staging: hv: Convert camel cased functions in rndis_filter.c to lower cases
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Haiyang Zhang [Fri, 10 Dec 2010 20:03:56 +0000 (12:03 -0800)]
staging: hv: Convert camel cased variables in rndis_filter.c to lower cases
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Haiyang Zhang [Fri, 10 Dec 2010 20:03:55 +0000 (12:03 -0800)]
staging: hv: Convert camel cased functions in netvsc.c to lower cases
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Haiyang Zhang [Fri, 10 Dec 2010 20:03:54 +0000 (12:03 -0800)]
staging: hv: Convert camel cased variables in netvsc.c to lower cases
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
L. Alberto Giménez [Sun, 12 Dec 2010 17:56:30 +0000 (18:56 +0100)]
Staging: rt2860: Avoid extern in .c file
rt28xx_close and rt28xx_open are already declared in a file included in
rt_config.h, so there is no need to declare them again.
Signed-off-by: L. Alberto Giménez <agimenez@sysvalve.es>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
L. Alberto Giménez [Sun, 12 Dec 2010 17:56:29 +0000 (18:56 +0100)]
Staging: rt2860: Clean spaces before tabs
Fix checkpatch complains
Signed-off-by: L. Alberto Giménez <agimenez@sysvalve.es>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Ruben Smits [Sat, 11 Dec 2010 07:26:18 +0000 (08:26 +0100)]
staging: comedi: add support for newer jr3 1-channel pci board
add DEVICE_ID to table
Signed-off-by: Ruben Smits <ruben.smits@mech.kuleuven.be>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Xenofon Foukas [Fri, 10 Dec 2010 19:07:25 +0000 (21:07 +0200)]
Staging: comedi: Fix coding style issues in ni_tiocmd.c
This patch fixes the following issues in ni_tiocmd.c:
WARNING: braces {} are not necessary for any arm of this statement
WARNING: braces {} are not necessary for single statement blocks
WARNING: printk() should include KERN_ facility level
WARNING: line over 80 characters
__func__ should be used instead of gcc specific __FUNCTION__
ERROR: that open brace { should be on the previous line
WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable
Signed-off-by: Xenofon Foukas <foukas.xenofon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Mon, 13 Dec 2010 09:39:20 +0000 (10:39 +0100)]
staging: ft1000: Always extract device number from netdev name.
Using gCardIndex as global variable was not correctly used because
for every plugged device was set to 0 in init_ft1000_netdev.
Remove global definition. Use it locally and for every plugged
device extract number from net device name.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Greg Kroah-Hartman [Fri, 10 Dec 2010 18:56:18 +0000 (10:56 -0800)]
Staging: iio: fix up world writable sysfs files.
You should not be able to write to sysfs files from any user.
Cc: Graf Yang <graf.yang@analog.com>
Cc: Michael Hennerich <michael.hennerich@analog.com>
Cc: Jonathan Cameron <jic23@cam.ac.uk>
Cc: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Greg Kroah-Hartman [Fri, 10 Dec 2010 18:55:27 +0000 (10:55 -0800)]
Staging: ft1000: fix world writable debugfs file
You should not be able to write to a debugfs file from any user.
Cc: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Greg Kroah-Hartman [Fri, 10 Dec 2010 18:46:30 +0000 (10:46 -0800)]
Staging: cxt1e1: rename global log_level variable
The driver should not have such a generic global variable name.
Reported-by: Zimny Lech <napohybelskurwysynom2010@gmail.com>
Cc: Bob Beers <bob.beers@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mark Allyn [Fri, 10 Dec 2010 15:37:48 +0000 (07:37 -0800)]
staging: sep: fix comments in sep_get_static_pool_addr_handler
Original comments were inaccurate
Signed-off-by: Mark Allyn <mark.a.allyn@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Dan Carpenter [Fri, 10 Dec 2010 12:41:18 +0000 (15:41 +0300)]
Staging: rtl8192u: add missing curly braces
The if condition was ignored in the original code and we just used the
default channel.
Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Xenofon Foukas [Fri, 3 Dec 2010 22:17:55 +0000 (00:17 +0200)]
Staging: comedi: Fix coding style issues in drivers.c
This patch fixes line over 80 characters warning issues found
in file drivers.c
Signed-off-by: Xenofon Foukas <foukas.xenofon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mark Allyn [Thu, 9 Dec 2010 17:32:53 +0000 (09:32 -0800)]
Staging: sep: eliminate kernel crash due to null parameter in dma_alloc_coherent
Signed-off-by: Mark Allyn <mark.a.allyn@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mark Allyn [Thu, 9 Dec 2010 17:32:38 +0000 (09:32 -0800)]
Staging: sep: ensure that caller id buffer is little endian
Signed-off-by: Mark Allyn <mark.a.allyn@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mark Allyn [Thu, 9 Dec 2010 17:32:26 +0000 (09:32 -0800)]
Staging: sep: reduce 64 and 32 bit compile warnings
Signed-off-by: Mark Allyn <mark.a.allyn@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mark Allyn [Thu, 9 Dec 2010 17:32:13 +0000 (09:32 -0800)]
Staging: sep: limit time to wait for reconfig shared area complete
Signed-off-by: Mark Allyn <mark.a.allyn@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mark Allyn [Thu, 9 Dec 2010 17:31:57 +0000 (09:31 -0800)]
Staging: sep: remove completed items in TODO
Signed-off-by: Mark Allyn <mark.a.allyn@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mark Allyn [Thu, 9 Dec 2010 17:31:43 +0000 (09:31 -0800)]
Staging: sep: remove code for Moorestown device
The Moorestown (older device) will be added to driver
later.
Signed-off-by: Mark Allyn <mark.a.allyn@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mark Allyn [Thu, 9 Dec 2010 17:31:31 +0000 (09:31 -0800)]
Staging: sep: initialize driver copy of send and receive count with device
Signed-off-by: Mark Allyn <mark.a.allyn@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mark Allyn [Thu, 9 Dec 2010 17:31:18 +0000 (09:31 -0800)]
Staging: sep: clean up error checking in probe function
Add pci_disable
Signed-off-by: Mark Allyn <mark.a.allyn@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mark Allyn [Thu, 9 Dec 2010 17:30:31 +0000 (09:30 -0800)]
Staging: sep: sram_addr is 32 bit; this is not a kernel address, but device internal value
This does not have to be 64 bits wide
Signed-off-by: Mark Allyn <mark.a.allyn@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mark Allyn [Thu, 9 Dec 2010 17:30:17 +0000 (09:30 -0800)]
Staging: sep: remove spaces at end of lines
Signed-off-by: Mark Allyn <mark.a.allyn@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mark Allyn [Thu, 9 Dec 2010 17:30:03 +0000 (09:30 -0800)]
Staging: sep: remove virtual address being passed to user space application
Signed-off-by: Mark Allyn <mark.a.allyn@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Thu, 9 Dec 2010 15:13:54 +0000 (16:13 +0100)]
staging: ft1000: Add file header to ft1000_proc.c
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Thu, 9 Dec 2010 15:13:53 +0000 (16:13 +0100)]
staging: ft1000: Remove dead code.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Thu, 9 Dec 2010 15:13:52 +0000 (16:13 +0100)]
staging: ft1000: Fix coding style.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Thu, 9 Dec 2010 15:13:51 +0000 (16:13 +0100)]
staging: ft1000: Coding style fix in ft1000ReadProc.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Thu, 9 Dec 2010 15:13:50 +0000 (16:13 +0100)]
staging: ft1000: Fix coding style in ft1000NotifyProc.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Thu, 9 Dec 2010 15:13:49 +0000 (16:13 +0100)]
staging: ft1000: Use return value for ft1000InitProc.
Add checking for return value ft1000InitProc and cleanup
if something fail.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Thu, 9 Dec 2010 15:13:48 +0000 (16:13 +0100)]
staging: ft1000: Fix coding style.
Fix coding style in ft1000CleanupProc and ft1000InitProc
functions.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Thu, 9 Dec 2010 15:13:47 +0000 (16:13 +0100)]
staging: ft1000: Fix proc initialization handling.
Cleaning proc entries when error occures was not handled correctly.
So fix and also add proper cleaning.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Thu, 9 Dec 2010 10:26:53 +0000 (11:26 +0100)]
staging: ft1000: Fix debug messages.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Thu, 9 Dec 2010 10:26:52 +0000 (11:26 +0100)]
staging: ft1000: Remove unused headers.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Thu, 9 Dec 2010 10:26:51 +0000 (11:26 +0100)]
staging: ft1000: Remove dead code.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Thu, 9 Dec 2010 10:26:50 +0000 (11:26 +0100)]
staging: ft1000: Fix camelcase functions and variables.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Thu, 9 Dec 2010 10:26:49 +0000 (11:26 +0100)]
staging: ft1000: Remove unused variable.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Thu, 9 Dec 2010 10:26:48 +0000 (11:26 +0100)]
staging: ft1000: Remove unused pdevobj array.
We don't need to store pointer to device in some local
array because we always pass to debugfs correct device pointer.
So remove it.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Thu, 9 Dec 2010 10:26:47 +0000 (11:26 +0100)]
staging: ft1000: Fix private data pointer usage.
Assign private data pointer to device for usage in file operations.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Thu, 9 Dec 2010 10:26:46 +0000 (11:26 +0100)]
staging: ft1000: Convert char device to debugfs.
Character device was used only for debugging purposes.
Convert it to debugfs functionality. For every plugged device
create new directory with one file.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Randy Dunlap [Thu, 9 Dec 2010 17:38:34 +0000 (09:38 -0800)]
staging: solo6010 depends on I2C
This driver uses i2c interfaces, so it should depend on I2C
(unless someone wants to break it into pieces or make it more
config-dependent).
drivers/staging/solo6x10/solo6010-i2c.c:47: error: implicit declaration of function 'i2c_transfer'
drivers/staging/solo6x10/solo6010-i2c.c:299: error: implicit declaration of function 'i2c_add_adapter'
drivers/staging/solo6x10/solo6010-i2c.c:310: error: implicit declaration of function 'i2c_del_adapter'
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Ben Collins <bcollins@bluecherry.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Thu, 9 Dec 2010 18:36:08 +0000 (19:36 +0100)]
staging: brcm80211: removed ap related comments
Code cleanup, reaction on the 2nd email from Dan Carpenter.
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Namhyung Kim [Thu, 9 Dec 2010 16:40:25 +0000 (01:40 +0900)]
Staging: sm7xx: use DEFINE_PCI_DEVICE_TABLE
Convert 'const struct pci_device_id xxx[]' to 'DEFINE_PCI_DEVICE_TABLE(xxx)'.
Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Namhyung Kim [Thu, 9 Dec 2010 16:40:27 +0000 (01:40 +0900)]
Staging: rtl8192e: use DEFINE_PCI_DEVICE_TABLE
Convert 'const struct pci_device_id xxx[]' to 'DEFINE_PCI_DEVICE_TABLE(xxx)'.
Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Namhyung Kim [Thu, 9 Dec 2010 16:40:26 +0000 (01:40 +0900)]
Staging: cx25821: use DEFINE_PCI_DEVICE_TABLE
Convert 'const struct pci_device_id xxx[]' to 'DEFINE_PCI_DEVICE_TABLE(xxx)'.
Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Namhyung Kim [Thu, 9 Dec 2010 16:40:28 +0000 (01:40 +0900)]
Staging: phison: use DEFINE_PCI_DEVICE_TABLE
Convert 'const struct pci_device_id xxx[]' to 'DEFINE_PCI_DEVICE_TABLE(xxx)'.
Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Namhyung Kim [Thu, 9 Dec 2010 16:40:29 +0000 (01:40 +0900)]
Staging: vme_tsi148: use DEFINE_PCI_DEVICE_TABLE
Convert 'const struct pci_device_id xxx[]' to 'DEFINE_PCI_DEVICE_TABLE(xxx)'.
Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Namhyung Kim [Thu, 9 Dec 2010 16:40:30 +0000 (01:40 +0900)]
Staging: vme_ca91cx42: use DEFINE_PCI_DEVICE_TABLE
Convert 'const struct pci_device_id xxx[]' to 'DEFINE_PCI_DEVICE_TABLE(xxx)'.
Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Tobias Klauser [Thu, 9 Dec 2010 15:01:07 +0000 (16:01 +0100)]
staging: brcm80211: Remove redundant unlikely()
IS_ERR() already implies unlikely(), so it can be omitted here.
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Chen, Chien-Chia [Thu, 9 Dec 2010 02:52:08 +0000 (10:52 +0800)]
Staging: rt2860: fix previous patch error
Somehow Greg messed up the last patch and missed a chunk. This patch
contains the missing chunk.
Acked-by: Lee, Chun-Yi <jlee@novell.com>
Signed-off-by: Chen, Chien-Chia <machen@novell.com>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Peter Huewe [Tue, 7 Dec 2010 22:44:33 +0000 (23:44 +0100)]
staging/zram: Fix sparse warning 'Using plain integer as NULL pointer'
This patch fixes the warning generated by sparse: "Using plain integer
as NULL pointer" by replacing the offending 0s with NULL.
Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Peter Huewe [Tue, 7 Dec 2010 22:38:02 +0000 (23:38 +0100)]
staging/line6: Fix sparse warning 'Using plain integer as NULL pointer'
This patch fixes the warning generated by sparse: "Using plain integer
as NULL pointer" by replacing the offending 0s with NULL.
Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Henry Ptasinski [Wed, 8 Dec 2010 21:18:04 +0000 (13:18 -0800)]
staging: brcm80211: fix documentation on installing firmware
Fix the documentation to have the current firmware filenames and use the
correct path.
Signed-off-by: Henry Ptasinski <henryp@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Henry Ptasinski [Wed, 8 Dec 2010 21:09:49 +0000 (13:09 -0800)]
MAINTAINERS: update the entry for the BRCM80211 driver
This time with Signed-off-by ...
Removed Nohee, added Roland, Arend and Dowan. Changes were previously made
to drivers/staging/brcm80211{README,TODO}, but MAINTAINERS was missed.
Signed-off-by: Henry Ptasinski <henryp@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Wed, 8 Dec 2010 19:16:02 +0000 (20:16 +0100)]
staging: brcm80211: removed unused struct wlc_ap_info
Code cleanup, reaction on the email from Dan Carpenter.
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Tue, 7 Dec 2010 16:45:46 +0000 (17:45 +0100)]
staging: brcm80211: replaced typedef wlc_pub_t by struct wlc_pub
Code cleanup
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Tue, 7 Dec 2010 16:45:45 +0000 (17:45 +0100)]
staging: brcm80211: replaced typedef wlccore_t by struct wlccore
Code cleanup
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Tue, 7 Dec 2010 16:45:44 +0000 (17:45 +0100)]
staging: brcm80211: replaced typedef wlcband_t by struct wlcband
Code cleanup.
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Tue, 7 Dec 2010 16:45:43 +0000 (17:45 +0100)]
staging: brcm80211: replaced typedef hnddma_t by struct hnddma_pub
Code cleanup.
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Tue, 7 Dec 2010 16:45:42 +0000 (17:45 +0100)]
staging: brcm80211: replaced typedef wl_if_t by struct wl_if
Code cleanup.
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Tue, 7 Dec 2010 16:45:41 +0000 (17:45 +0100)]
staging: brcm80211: replaced typedef bmac_pmq_t by struct bmac_pmq
Code cleanup.
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Tue, 7 Dec 2010 16:45:40 +0000 (17:45 +0100)]
staging: brcm80211: replaced typedef antsel_info_t by struct antsel_info
Code cleanup.
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Tue, 7 Dec 2010 16:45:39 +0000 (17:45 +0100)]
staging: brcm80211: replaced typedef wlc_ap_info_t by struct wlc_ap_info
Code cleanup.
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Tue, 7 Dec 2010 16:45:38 +0000 (17:45 +0100)]
staging: brcm80211: replaced typedef ampdu_info_t by struct ampdu_info
Code cleanup.
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Tue, 7 Dec 2010 16:45:37 +0000 (17:45 +0100)]
staging: brcm80211: replaced typedef wlc_if_t by struct wlc_if
Code cleanup.
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Tue, 7 Dec 2010 16:45:36 +0000 (17:45 +0100)]
staging: brcm80211: removed unused macro's and typedefs from wpa.h
Code cleanup.
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Tue, 7 Dec 2010 16:45:35 +0000 (17:45 +0100)]
staging: brcm80211: removed unused typedefs
Code cleanup.
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Chen, Chien-Chia [Wed, 8 Dec 2010 22:20:33 +0000 (14:20 -0800)]
Staging: rt3090: Fix RT3090 scan AP function
Fix RT3090 scan AP function.
This patch fixes the rt3090 wireless module failed
to scan AP around due to Windows driver causing
rt3090 module unable to scan AP in Linux.
Acked-by: Lee, Chun-Yi <jlee@novell.com>
Signed-off-by: Chen, Chien-Chia <machen@novell.com>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Greg Kroah-Hartman [Tue, 7 Dec 2010 18:47:56 +0000 (10:47 -0800)]
Staging: Merge 2.6.37-rc5 into staging-next
This was done to handle a number of conflicts in the batman-adv
and winbond drivers properly. It also now allows us to fix up the sysfs
attributes properly that were not in the .37 release due to them being
only in this tree at the time.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Linus Torvalds [Tue, 7 Dec 2010 04:09:04 +0000 (20:09 -0800)]
Linux 2.6.37-rc5
Linus Torvalds [Tue, 7 Dec 2010 04:08:25 +0000 (20:08 -0800)]
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
ocfs2_connection_find() returns pointer to bad structure
ocfs2: char is not always signed
Ocfs2: Stop tracking a negative dentry after dentry_iput().
ocfs2: fix memory leak
fs/ocfs2/dlm: Use GFP_ATOMIC under spin_lock
Olof Johansson [Tue, 7 Dec 2010 01:36:32 +0000 (19:36 -0600)]
ARM: tegra: fix regression from addruart rewrite
Commit
0ea129300982 ("arm: return both physical and virtual addresses
from addruart") took out the test for MMU on/off but didn't switch the
ldr instructions to no longer be conditionals based on said test.
Fix that.
Signed-off-by: Olof Johansson <olof@lixom.net>
Acked-by: Colin Cross <ccross@android.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Hank Janssen [Mon, 6 Dec 2010 20:26:51 +0000 (12:26 -0800)]
staging: hv: Convert camel case local variables in blkvsc.c to lowercase
Convert camel case local variables in blkvsc.c to lowercase
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Hank Janssen [Mon, 6 Dec 2010 20:26:50 +0000 (12:26 -0800)]
staging: hv: Convert camel case function names in blkvsc.c to lowercase
Convert camel case function names in blkvsc.c to lowercase
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Hank Janssen [Mon, 6 Dec 2010 20:26:49 +0000 (12:26 -0800)]
staging: hv: Convert camel case local variables in storvsc.c to lowercase
Convert camel case local variables in storvsc.c to lowercase
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Hank Janssen [Mon, 6 Dec 2010 20:26:48 +0000 (12:26 -0800)]
staging: hv: Convert camel case function names in storvsc.c to lowercase
Convert camel case function names in storvsc.c to lowercase
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Hank Janssen [Mon, 6 Dec 2010 20:26:47 +0000 (12:26 -0800)]
staging: hv: Convert camel case struct fields in storvsc.c to lowercase
Convert camel cased struct fields in storvsc.c to lowercase
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Hank Janssen [Mon, 6 Dec 2010 20:26:46 +0000 (12:26 -0800)]
staging: hv: Convert camel case functions in storvsc_api.h to lowercase
Convert camel case functions in storvsc_api.h to lowercase
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Hank Janssen [Mon, 6 Dec 2010 20:26:45 +0000 (12:26 -0800)]
staging: hv: Convert camel case struct fields in storvsc_api.h to lowercase
Convert camel case struct fields in vstorage.h to lowercase
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Hank Janssen [Mon, 6 Dec 2010 20:26:44 +0000 (12:26 -0800)]
staging: hv: Convert camel case struct fields in vstorage.h to lowercase
Convert camel case struct fields in vstorage.h to lowercase
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>