summaryrefslogtreecommitdiffstats
path: root/drivers/staging
Commit message (Collapse)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6Linus Torvalds2008-12-284-44/+47
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1429 commits) net: Allow dependancies of FDDI & Tokenring to be modular. igb: Fix build warning when DCA is disabled. net: Fix warning fallout from recent NAPI interface changes. gro: Fix potential use after free sfc: If AN is enabled, always read speed/duplex from the AN advertising bits sfc: When disabling the NIC, close the device rather than unregistering it sfc: SFT9001: Add cable diagnostics sfc: Add support for multiple PHY self-tests sfc: Merge top-level functions for self-tests sfc: Clean up PHY mode management in loopback self-test sfc: Fix unreliable link detection in some loopback modes sfc: Generate unique names for per-NIC workqueues 802.3ad: use standard ethhdr instead of ad_header 802.3ad: generalize out mac address initializer 802.3ad: initialize ports LACPDU from const initializer 802.3ad: remove typedef around ad_system 802.3ad: turn ports is_individual into a bool 802.3ad: turn ports is_enabled into a bool 802.3ad: make ntt bool ixgbe: Fix set_ringparam in ixgbe to use the same memory pools. ... Fixed trivial IPv4/6 address printing conflicts in fs/cifs/connect.c due to the conversion to %pI (in this networking merge) and the addition of doing IPv6 addresses (from the earlier merge of CIFS).
| * staging-winbond: Kill directly reference of netdev->privWang Chen2008-12-081-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | This driver is not yet finished. At this time, we don't know how netdev be created and how private data be allocated. So, simply use netdev_priv() now and leave some temp comment. Compile test only. Signed-off-by: Wang Chen <wangchen@cn.fujitsu.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * staging-slicoss: Kill directly reference of netdev->privWang Chen2008-12-061-4/+3
| | | | | | | | | | | | | | | | Simply replace netdev->priv with netdev_priv(). Signed-off-by: Wang Chen <wangchen@cn.fujitsu.com> Acked-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: David S. Miller <davem@davemloft.net>
| * staging-p80211: Kill directly reference of netdev->privWang Chen2008-12-062-39/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In this driver, netdev's private data is wlandevice_t. And the wlandev(type of wlandevice_t) is exist before netdev be allocated. So use netdev->ml_priv to point to the private data. I am not sure whether I should consider the kernel version older than 2.3.38. Because in those kernels, netdevice_t is "structure dev" instead of "structure net_device" and of course "dev->ml_priv" will cause compile error. But before my patch, in function wlan_setup(), there is a ether_setup(net_device) which already broke kernels which older than 2.3.38. Signed-off-by: Wang Chen <wangchen@cn.fujitsu.com> Acked-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: David S. Miller <davem@davemloft.net>
* | STAGING: Move staging drivers back to staging-specific menuDmitry Baryshkov2008-12-171-0/+3
|/ | | | | | Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Don't ask twice about not including staging driversLinus Torvalds2008-11-091-1/+1
| | | | | | | | | | | | | | The "Exclude staging drivers" question is there so that we don't build staging drivers for allyesconfig or allnoconfig settings, but it's very irritating when you've already said "no" to staging drivers earlier. There is absolutely no point in declining twice - once you've declined the staging drivers, you're done. So make the second question depend on the first question having been answered in the affirmative. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* Staging: make usbip depend on CONFIG_NETGreg Kroah-Hartman2008-11-071-1/+1
| | | | | | | Thanks to Randy Dunlap for finding this problem. Reported-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: only build the tree if we really want toGreg Kroah-Hartman2008-11-071-2/+18
| | | | | | | | | | | | | This Kconfig change allows the common 'make allmodconfig' and 'make allyesconfig' build options to skip the staging tree, which is probably what you want to have happen anyway. This makes the linux-next developer's life a lot easier so he doesn't have to worry about changes that break the staging tree, that's for me to worry about... Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* drivers: remove duplicated #includeJianjun Kong2008-11-042-2/+0
| | | | | Signed-off-by: Jianjun Kong <jianjun@zeuux.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* saner FASYNC handling on file closeAl Viro2008-11-011-3/+0
| | | | | | | | | | | | | | As it is, all instances of ->release() for files that have ->fasync() need to remember to evict file from fasync lists; forgetting that creates a hole and we actually have a bunch that *does* forget. So let's keep our lives simple - let __fput() check FASYNC in file->f_flags and call ->fasync() there if it's been set. And lose that crap in ->release() instances - leaving it there is still valid, but we don't have to bother anymore. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* staging: pcc_acpi: delete obsolete driverLen Brown2008-10-236-1133/+0
| | | | | | | pcc_acpi is based on an old version of drivers/misc/panasonic-laptop.c Signed-off-by: Len Brown <len.brown@intel.com>
* pcc-acpi: fix compile with new stricter ACPI typesLinus Torvalds2008-10-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | This was another merge problem that wasn't a data conflict, but due to independent changes in two branches that just didn't work together. The pcc-acpi staging driver used acpi_driver_data(device) = hotkey; to set driver data, but the ACPI merge made that invalid in commit db89b4f0dbab837d0f3de2c3e9427a8d5393afa3 ("ACPI: catch calls of acpi_driver_data on pointer of wrong type"), and now you're supposed to just do. device->driver_data = hotkey; instead. Fix it up. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* Staging: usbip: fix build warning on 64bit kernelsGreg Kroah-Hartman2008-10-221-1/+1
| | | | | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: me4000: remove some compiler warningsGreg Kroah-Hartman2008-10-221-6/+6
| | | | | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: wbusb: fix a bunch of compiler warningsGreg Kroah-Hartman2008-10-223-13/+25
| | | | | | | First cut at removing some obvious compiler warnings. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: w35und: module init cleanupPekka Enberg2008-10-221-56/+31
| | | | | | | | | | This patch cleans up the module init functions a bit and removes the redundant device ID check from wb35_probe() function. Acked-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: w35und: use gotos for error handlingPekka Enberg2008-10-224-327/+313
| | | | | | | | | | | The driver code uses do { } while (0) together with the break statement to emulate gotos for error handling. Fix that up by using the goto statement instead. Acked-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: w35und: remove spinlock wrappersPekka Enberg2008-10-226-38/+27
| | | | | | | | | This patch removes the OS_SPIN_LOCK and related wrappers from the driver code. Acked-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: sxg: fix compiler warnings.Greg Kroah-Hartman2008-10-221-8/+8
| | | | | | sizeof() isn't an unsigned long :( Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: sxg: fix up unused function warningsGreg Kroah-Hartman2008-10-221-77/+78
| | | | | | | | These functions aren't used yet, so put them behind the proper #define so the compiler doesn't complain about them. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: sxg: clean up C99 commentsJ.R. Mauro2008-10-222-580/+580
| | | | | | | | | | | Change C99 comments to C89 comments Some nested comments seem to have been missed and some blocks are redundantly commented, but at least most of the //'s are gone Signed-off by: J.R. Mauro <jrm8005@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: Lindent the echo driverJ.R. Mauro2008-10-226-672/+654
| | | | | | | | Lindent drivers/staging/echo* Signed-off by: J.R. Mauro <jrm8005@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: SLICOSS: Free multicast list at driver exitLior Dotan2008-10-221-0/+8
| | | | | | | | | The multicast address list is allocated in slic_mcast_add_list() but never freed. Signed-off-by: Lior Dotan <liodot@gmail.com>
* Staging: PCC-ACPI: Fix all checkpatch errorsLior Dotan2008-10-221-185/+244
| | | | | | | | Fix all complaints that checkpatch had regarding this patch Signed-off-by: Lior Dotan <liodot@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: pcc-acpi: update to latest versionGreg Kroah-Hartman2008-10-221-231/+309
| | | | | | | | | Import the changes from the upstream driver into this version to keep things up to date. Cc: Yokota Hiroshi <yokota@netlab.cs.tsukuba.ac.jp> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: Clean up sxg driverJ.R. Mauro2008-10-224-379/+368
| | | | | | | | Lindent the rest of the files in drivers/staging/sxg Signed off by: J.R. Mauro <jrm8005@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: remove remaining uses of __FUNCTION__Harvey Harrison2008-10-222-5/+5
| | | | | | | | __FUNCTION__ is gcc-specific, use __func__ Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: add poch driverVijay Kumar2008-10-227-0/+1471
| | | | | | | | | | | | | | | | | This is the first cut at a driver for the Redrapids Pocket Change CardBus devices. Receiving data seems to work properly, but overflows happen on transmit. Still needs more hardware debugging to work properly. (cleaned up to use proper driver core api functions by Greg) From: Vijay Kumar <vijaykumar@bravegnu.org> Cc: Alexey Zaytsev <alexey.zaytsev@gmail.com> Cc: Jaya Kumar <jayakumar.lkml@gmail.com> Cc: Ken Sienski <sienski@redrapids.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: wlan-ng: fix build error if wireless networking is not enabledGreg Kroah-Hartman2008-10-221-1/+1
| | | | | | | | Thanks to Ingo for pointing this out. Cc: Ingo Molnar <mingo@elte.hu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: echo: remove annoying "end of function" markersPekka Enberg2008-10-223-26/+0
| | | | | | | | | | | This patch removes the very noisy "end of function" markers that are very annoying when reading the driver code. Cc: David Rowe <david@rowetel.com> Cc: Steve Underwood <steveu@coppice.org> Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: echo: remove __cplusplus macro magicPekka Enberg2008-10-222-16/+0
| | | | | | | | | | | The kernel is written in C, so remove the __cplusplus macro magic from the driver. Cc: David Rowe <david@rowetel.com> Cc: Steve Underwood <steveu@coppice.org> Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: echo: remove dead codePekka Enberg2008-10-221-45/+0
| | | | | | | | | | This patch removes dead code that is wrapped in #ifndef __KERNEL__. Cc: David Rowe <david@rowetel.com> Cc: Steve Underwood <steveu@coppice.org> Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: echo: fix kmalloc()/kfree() usesPekka Enberg2008-10-222-28/+22
| | | | | | | | | | | | | This patch removes the malloc()/free() macro wrappers and converts call-sites to use kcalloc() and kzalloc() where appropriate. I also fixed up out-of-memory error handling in couple of places where it was broken. Cc: David Rowe <david@rowetel.com> Cc: Steve Underwood <steveu@coppice.org> Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: echo: Replace __BLACKFIN__ASM__ with __bfin__Tzafrir Cohen2008-10-222-5/+5
| | | | | | Signed-off-by: Tzafrir Cohen <tzafrir@cohens.org.il> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: echo: Changed preffix from echo_can_ to oslec_Tzafrir Cohen2008-10-223-27/+27
| | | | | | Signed-off-by: Tzafrir Cohen <tzafrir@cohens.org.il> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: echo: Replace echo_can_state_t with struct echo_can_stateTzafrir Cohen2008-10-222-18/+18
| | | | | | Signed-off-by: Tzafrir Cohen <tzafrir@cohens.org.il> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: echo: Export interface functions. Add module headers.Tzafrir Cohen2008-10-221-1/+12
| | | | | | Signed-off-by: Tzafrir Cohen <tzafrir@cohens.org.il> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: echo: A separate oslec.h for external interfaceTzafrir Cohen2008-10-222-50/+89
| | | | | | | | | | Split out the external interface to a separate file called oslec.h . Give the struct a name while we're at it. Signed-off-by: Tzafrir Cohen <tzafrir@cohens.org.il> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: sxg: replace __FUNCTION__ with __func__Harvey Harrison2008-10-222-104/+104
| | | | | | | | __FUNCTION__ is gcc-specific, use __func__ Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: w35und: remove some typedefsPekka Enberg2008-10-2223-124/+119
| | | | | | | | | This patch removes some obfuscating typedefs from the driver code. Cc: Pavel Machek <pavel@suse.cz> Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: SLICOSS: remove unused #include <version.h>Huang Weiyi2008-10-221-1/+0
| | | | | | | | | | | The file(s) below do not use LINUX_VERSION_CODE nor KERNEL_VERSION. drivers/staging/slicoss/slicoss.c This patch removes the said #include <version.h>. Signed-off-by: Huang Weiyi <weiyi.huang@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: go7007: remove unused #include <version.h>Huang Weiyi2008-10-2212-12/+0
| | | | | | | | | | | | | | | | | | | | | | The file(s) below do not use LINUX_VERSION_CODE nor KERNEL_VERSION. drivers/staging/go7007/go7007-driver.c drivers/staging/go7007/go7007-fw.c drivers/staging/go7007/go7007-i2c.c drivers/staging/go7007/go7007-usb.c drivers/staging/go7007/snd-go7007.c drivers/staging/go7007/wis-ov7640.c drivers/staging/go7007/wis-saa7113.c drivers/staging/go7007/wis-saa7115.c drivers/staging/go7007/wis-sony-tuner.c drivers/staging/go7007/wis-tw2804.c drivers/staging/go7007/wis-tw9903.c drivers/staging/go7007/wis-uda1342.c This patch removes the said #include <version.h>. Signed-off-by: Huang Weiyi <weiyi.huang@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: wlan-ng: prism2: remove more duplicated #includeHuang Weiyi2008-10-221-1/+0
| | | | | | | | | Removed duplicated #include "version.h" in drivers/staging/wlan-ng/p80211wep.c. Signed-off-by: Huang Weiyi <weiyi.huang@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: wlan-ng: prism2: remove duplicated #includeHuang Weiyi2008-10-221-2/+0
| | | | | | | | | Removed duplicated #include "wlan_compat.h" in drivers/staging/wlan-ng/prism2mib.c. Signed-off-by: Huang Weiyi <weiyi.huang@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: et131x: remove duplicated #include'sHuang Weiyi2008-10-223-4/+0
| | | | | | | | | | | | | | | Removed duplicated #include's in file(s) below, - drivers/staging/et131x/et1310_phy.c et1310_jagcore.h linux/delay.h - drivers/staging/et131x/et131x_debug.c et1310_jagcore.h - drivers/staging/et131x/et131x_initpci.c et1310_jagcore.h Signed-off-by: Huang Weiyi <weiyi.huang@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: SLICOSS: remove duplicated #include'sHuang Weiyi2008-10-221-8/+0
| | | | | | | | | | | | | | | | Removed duplicated #include's in drivers/staging/slicoss/slicoss.c. linux/delay.h linux/etherdevice.h linux/init.h linux/netdevice.h linux/pci.h linux/skbuff.h linux/slab.h linux/string.h Signed-off-by: Huang Weiyi <weiyi.huang@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: Fixes for me4000 pci data collection driverLior Dotan2008-10-222-545/+545
| | | | | | | | | | | | | | Following Andrew Morton's review for this patch I made a patch that fixes most of the remarks. I've converted the sleep_on_timeout to wait_event_timeout but I probably not in the right way. Also I don't know what's the problem with the calls for get_user() so I left them untouched. Signed-off-by: Lior Dotan <liodot@gmail.com> Cc: Andrew Morton <akpm@linuxfoundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: balance parenthesis in wlan-ng headersMariusz Kozlowski2008-10-221-1/+1
| | | | | | | | Balance parenthesis in HFA384x_CMD_QOS_GET macro. Signed-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: fix potential build error in slicoss driverMariusz Kozlowski2008-10-221-1/+0
| | | | | | | | | This hides under DEBUG_REGISTER_TRACE so probably not visible to many people. Signed-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: Fix leak in drivers/staging/at76_usb.cDiego Calleja2008-10-221-1/+3
| | | | | | | | | | | Fix leak in at76_usb as reported in: http://bugzilla.kernel.org/show_bug.cgi?id=11778 Reported-by: Daniel Marjamäki <danielm77@spray.se> Signed-off-by: Diego Calleja <diegocg@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 21:33:51 +0000