Commit Graph

223468 Commits

Author SHA1 Message Date
Randy Dunlap 372058f1b4 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>
2010-12-09 16:29:49 -08:00
Roland Vossen 0e0792fef4 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>
2010-12-09 16:29:48 -08:00
Namhyung Kim 6f475b7160 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>
2010-12-09 16:29:48 -08:00
Namhyung Kim 5eaa53de2d 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>
2010-12-09 16:29:48 -08:00
Namhyung Kim 94ab896367 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>
2010-12-09 16:29:48 -08:00
Namhyung Kim abb9eb75a3 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>
2010-12-09 16:29:48 -08:00
Namhyung Kim 270b64bb4c 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>
2010-12-09 16:29:47 -08:00
Namhyung Kim 2cea0cf284 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>
2010-12-09 16:29:47 -08:00
Tobias Klauser 310d605293 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>
2010-12-09 16:29:46 -08:00
Chen, Chien-Chia 1f0613158e 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>
2010-12-09 16:15:41 -08:00
Peter Huewe be3e5b3246 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>
2010-12-08 14:31:02 -08:00
Peter Huewe 597a1e7ccc 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>
2010-12-08 14:31:01 -08:00
Henry Ptasinski fb657461ab 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>
2010-12-08 14:28:51 -08:00
Henry Ptasinski 818c07b894 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>
2010-12-08 14:28:50 -08:00
Roland Vossen baffa2f609 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>
2010-12-08 14:28:50 -08:00
Roland Vossen 08db27dc8d 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>
2010-12-08 14:27:48 -08:00
Roland Vossen c41c858f69 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>
2010-12-08 14:27:48 -08:00
Roland Vossen f077f7185c 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>
2010-12-08 14:27:48 -08:00
Roland Vossen 17d766510b 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>
2010-12-08 14:27:48 -08:00
Roland Vossen 6cdeaef203 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>
2010-12-08 14:27:48 -08:00
Roland Vossen d65ddb5832 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>
2010-12-08 14:27:47 -08:00
Roland Vossen 299f8a4658 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>
2010-12-08 14:27:47 -08:00
Roland Vossen 0e49347489 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>
2010-12-08 14:27:47 -08:00
Roland Vossen 1f2fd4531d 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>
2010-12-08 14:27:47 -08:00
Roland Vossen 4dc79de1e3 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>
2010-12-08 14:27:47 -08:00
Roland Vossen 41224eb2df 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>
2010-12-08 14:27:46 -08:00
Roland Vossen 0dedc37070 staging: brcm80211: removed unused typedefs
Code cleanup.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-08 14:27:46 -08:00
Chen, Chien-Chia 1226056d96 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>
2010-12-08 14:20:56 -08:00
Greg Kroah-Hartman ea3398a1ae 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>
2010-12-07 10:47:56 -08:00
Linus Torvalds cf7d7e5a19 Linux 2.6.37-rc5 2010-12-06 20:09:04 -08:00
Linus Torvalds 086b17046c 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
2010-12-06 20:08:25 -08:00
Olof Johansson da8f2e2461 ARM: tegra: fix regression from addruart rewrite
Commit 0ea1293009 ("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>
2010-12-06 20:07:57 -08:00
Hank Janssen 03fa6fc5a6 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>
2010-12-06 16:11:10 -08:00
Hank Janssen 2e6484acd2 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>
2010-12-06 16:11:09 -08:00
Hank Janssen f638859e32 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>
2010-12-06 16:11:09 -08:00
Hank Janssen 02e37db714 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>
2010-12-06 16:11:09 -08:00
Hank Janssen 3d8cdf22b3 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>
2010-12-06 16:11:08 -08:00
Hank Janssen eb4f3e0aa6 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>
2010-12-06 16:11:08 -08:00
Hank Janssen 8a046024a7 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>
2010-12-06 16:11:07 -08:00
Hank Janssen d2aaba455f 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>
2010-12-06 16:11:07 -08:00
Dan Carpenter 37db526463 Staging: Beceem: more checkpatch.pl changes to InterfaceInit.c
The only checkpatch.pl issues remaining still remaining are line length
complaints.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-06 16:09:45 -08:00
Dan Carpenter 07a7f68800 Staging: Beceem: improve debug printk statements
These are just small changes.  Some grammar and wording changes.  I added
new lines to the end of all the print statements.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-06 16:09:45 -08:00
Dan Carpenter 6b74705e15 Staging: Beceem: use after free in bcm_exit()
We can't call class_destroy() until after the driver has been deregistered.
It leads to a NULL deref on module unload.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-06 16:09:45 -08:00
Dan Carpenter cd0b0ebfbe Staging: Beceem: remove old kernel compatibility code
This drops compatability for everything from 2.4 to 2.6.35.  Now it only
works on the latest kernel.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-06 16:09:45 -08:00
Dan Carpenter c2a0b162db Staging: Beceem: white space changes to InterfaceInit.c
This patch only changes:
1) spaces, tabs, and newline characters.
2) comment styles.

The compiled object file is the same before and after except for line
number changes.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-06 16:09:44 -08:00
Dan Carpenter 2a314742d3 Staging: Beceem: use lower case "int" instead of "INT"
This patch changes:
	INT => int
	ULONG => unsigned long
	VOID => void

Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-06 16:09:44 -08:00
Dan Carpenter 85c0b1760a Staging: Beceem: add USB id for BCSM250 Mobile WiMAX
Signed-off-by: Dan Carpenter <error27@gmail.com>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-06 16:09:43 -08:00
Roland Vossen e304151f15 staging: brcm80211: replaced wlc_hw_info_t by struct wlc_hw_info
Part of code cleanup effort.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-06 16:08:44 -08:00
Arend van Spriel 8538576474 staging: brcm80211: remove macro usage for sk_buff release
PKTFREE macro calls osl_pktfree. This function has been renamed to
pkt_buf_free_skb as it comprises of functionality additional to
dev_kfree_skb(_any) function and to get rid of the OSL concept in
this driver.

Reviewed-by: Brett Rudley <brudley@broadcom.com>
Reviewed-by: Dowan Kim <dowan@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-06 16:08:31 -08:00
Arend van Spriel f09e02322e staging: brcm80211: remove macro usage for sk_buff allocation
PKTGET macro calls osl_pktget. This function has been renamed to
pkt_buf_get_skb as it comprises of functionality additional to
dev_alloc_skb function and to get rid of the OSL concept in this driver.

Reviewed-by: Brett Rudley <brudley@broadcom.com>
Reviewed-by: Dowan Kim <dowan@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-06 16:08:30 -08:00