aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
Commit message (Collapse)AuthorAgeFilesLines
* net: fix 64 bit counters on 32 bit archesEric Dumazet2010-07-071-1/+2
| | | | | | | | | | | | | | | | | | There is a small possibility that a reader gets incorrect values on 32 bit arches. SNMP applications could catch incorrect counters when a 32bit high part is changed by another stats consumer/provider. One way to solve this is to add a rtnl_link_stats64 param to all ndo_get_stats64() methods, and also add such a parameter to dev_get_stats(). Rule is that we are not allowed to use dev->stats64 as a temporary storage for 64bit stats, but a caller provided area (usually on stack) Old drivers (only providing get_stats() method) need no changes. Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* bridge: use rx_handler_data pointer to store net_bridge_port pointerJiri Pirko2010-06-151-1/+1
| | | | | | | | | | Register net_bridge_port pointer as rx_handler data pointer. As br_port is removed from struct net_device, another netdev priv_flag is added to indicate the device serves as a bridge port. Also rcuized pointers are now correctly dereferenced in br_fdb.c and in netfilter parts. Signed-off-by: Jiri Pirko <jpirko@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* Merge branch 'for_linus' of ↵Linus Torvalds2010-05-301-8/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6 * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6: quota: Convert quota statistics to generic percpu_counter ext3 uses rb_node = NULL; to zero rb_root. quota: Fixup dquot_transfer reiserfs: Fix resuming of quotas on remount read-write pohmelfs: Remove dead quota code ufs: Remove dead quota code udf: Remove dead quota code quota: rename default quotactl methods to dquot_ quota: explicitly set ->dq_op and ->s_qcop quota: drop remount argument to ->quota_on and ->quota_off quota: move unmount handling into the filesystem quota: kill the vfs_dq_off and vfs_dq_quota_on_remount wrappers quota: move remount handling into the filesystem ocfs2: Fix use after free on remount read-only Fix up conflicts in fs/ext4/super.c and fs/ufs/file.c
| * pohmelfs: Remove dead quota codeDmitry Monakhov2010-05-271-8/+0
| | | | | | | | | | | | | | | | | | Quota on pohmelfs is non-functional. IFAIU quota logic was copy-pasted from generic setattr(). Acked-by: Evgeniy Polyakov <zbr@ioremap.net> Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org> Signed-off-by: Jan Kara <jack@suse.cz>
* | drop unused dentry argument to ->fsyncChristoph Hellwig2010-05-271-1/+1
| | | | | | | | | | Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
* | Staging: saa7134-go7007: replace dma_sync_single with dma_sync_single_for_cpuFUJITA Tomonori2010-05-271-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dma_sync_single() is deprecated and will be removed soon. No functional change since dma_sync_single is the wrapper of dma_sync_single_for_cpu. saa7134-go7007.c is commented out but anyway let's replace it. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Cc: Greg Kroah-Hartman <gregkh@suse.de> Cc: Ben Hutchings <ben@decadent.org.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* | staging: rt2860: use new hex_to_bin() methodAndy Shevchenko2010-05-252-15/+2
|/ | | | | | | | | Instead of using own implementation involve hex_to_bin() function. Signed-off-by: Andy Shevchenko <ext-andriy.shevchenko@nokia.com> Cc: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6Linus Torvalds2010-05-21732-51732/+56069
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (577 commits) Staging: ramzswap: Handler for swap slot free callback swap: Add swap slot free callback to block_device_operations swap: Add flag to identify block swap devices Staging: vt6655: use ETH_FRAME_LEN macro instead of custom one Staging: vt6655: use ETH_DATA_LEN macro instead of custom one Staging: vt6655: use ETH_FCS_LEN macro instead of custom one Staging: vt6656: use ETH_HLEN macro instead of custom one Staging: comedi: quatech_daqp_cs.c Replace eos semaphore with a completion. Staging: dt3155v4l: remove private memory allocator Staging: crystalhd: Remove typedefs from driver Staging: winbond: Fix for pointer name format issue in mds.c Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs Staging: vt6656: removed custom CHAR/SHORT/INT/LONG typedefs Staging: comedi: Altered the way printk is used in 8255.c staging: iio: adis16350 and similar IMU driver Staging: iio: max1363 Fix two bugs in single_channel_from_ring Staging: iio: adis16220 extract bin_attribute structures from state Staging: iio: adis16220 vibration sensor driver Staging: comedi: Kconfig dependancy fixes Staging: comedi: fix up build error from last Kconfig changes ...
| * Merge staging-next tree into Linus's latest versionGreg Kroah-Hartman2010-05-21732-51732/+56069
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: drivers/staging/arlan/arlan-main.c drivers/staging/comedi/drivers/cb_das16_cs.c drivers/staging/cx25821/cx25821-alsa.c drivers/staging/dt3155/dt3155_drv.c drivers/staging/hv/hv.c drivers/staging/netwave/netwave_cs.c drivers/staging/wavelan/wavelan.c drivers/staging/wavelan/wavelan_cs.c drivers/staging/wlags49_h2/wl_cs.c This required a bit of hand merging due to the conflicts that happened in the later .34-rc releases, as well as some staging driver changing coming in through other trees (v4l and pcmcia). Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * Staging: ramzswap: Handler for swap slot free callbackNitin Gupta2010-05-182-14/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Install handler for swap_slot_free_notify callback which is called when a swap slot is no longer used. This handler immediately frees memory allocated corresponding to the given swap slot. Signed-off-by: Nitin Gupta <ngupta@vflare.org> Acked-by: Linus Torvalds <torvalds@linux-foundation.org> Acked-by: Nigel Cunningham <nigel@tuxonice.net> Acked-by: Pekka Enberg <penberg@cs.helsinki.fi> Reviewed-by: Minchan Kim <minchan.kim@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * Staging: vt6655: use ETH_FRAME_LEN macro instead of custom oneCharles Clément2010-05-182-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | Replace custom maximum packet lenght definition MAX_PACKET_LEN by ETH_FRAME_LEN from <linux/if_ether.h>. Signed-off-by: Charles Clément <caratorn@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * Staging: vt6655: use ETH_DATA_LEN macro instead of custom oneCharles Clément2010-05-184-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | Replace custom maximum data lenght definition MAX_DATA_LEN by ETH_DATA_LEN from <linux/if_ether.h>. Signed-off-by: Charles Clément <caratorn@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * Staging: vt6655: use ETH_FCS_LEN macro instead of custom oneCharles Clément2010-05-182-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Replace custom FCS/CRC length definition U_CRC_LEN by ETH_FCS_LEN from <linux/if_ether.h>. Signed-off-by: Charles Clément <caratorn@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * Staging: vt6656: use ETH_HLEN macro instead of custom oneCharles Clément2010-05-182-14/+12
| | | | | | | | | | | | | | | | | | | | | | | | Replace custom header length definition U_HEADER_LEN by ETH_HLEN from <linux/if_ether.h>. Also remove unused U_TYPE_LEN. Signed-off-by: Charles Clément <caratorn@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * Staging: comedi: quatech_daqp_cs.c Replace eos semaphore with a completion.Alessio Igor Bogani2010-05-181-7/+8
| | | | | | | | | | | | | | | | | | | | | Build tested only. Signed-off-by: Alessio Igor Bogani <abogani@texware.it> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * Staging: dt3155v4l: remove private memory allocatorMarin Mitov2010-05-186-851/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch removes the private memory allocator and all conjugated functions. Now the driver uses videobuf-dma-contig module for allocations. Added reserving 4MB coherent memory for private per device allocations at probe time. Signed-off-by: Marin Mitov <mitov@issp.bas.bg> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * Staging: crystalhd: Remove typedefs from driverLior Dotan2010-05-1811-462/+442
| | | | | | | | | | | | | | | | | | | | | Remove typedefs from driver Signed-of-by: Lior Dotan <liodot@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * Staging: winbond: Fix for pointer name format issue in mds.cAdam Latham2010-05-181-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | This patch fixes the unnecessary whitespace found in pointer names in the mds.c file found by the checkpatch.pl tool Signed-off-by: Adam Latham <adam.latham@unisontorbay.org.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefsAndres More2010-05-1848-692/+700
| | | | | | | | | | | | | | | | | | | | | Cleared all checkpatch warnings but 'do not add new typedefs' ones. Signed-off-by: Andres More <more.andres@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * Staging: vt6656: removed custom CHAR/SHORT/INT/LONG typedefsAndres More2010-05-1810-56/+77
| | | | | | | | | | | | | | | | | | | | | Cleared all checkpatch warnings but one 'do not add new typedefs' Signed-off-by: Andres More <more.andres@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * Staging: comedi: Altered the way printk is used in 8255.cMark2010-05-181-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | This patch moves around the use of printk calls in 8255.c to include accurate logging levels and in turn fixes a few warnings from checkpatch. Signed-off-by: Mark Rankilor <reodge@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * staging: iio: adis16350 and similar IMU driverBarry Song2010-05-186-0/+1355
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This version has the right part number in the commit message. Whilst technically the part I listed last time is also supported by the driver, the commit message might have caused confusion. Another driver from Barry at Analog. Again, I've lifted if from the blackfin tree and done the usual sparse and checkpatch fixes + the abi changes. I actually have one of these, so am particularly pleased to see it supported! Signed-off-by: Barry Song <Barry.Song@analog.com> Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * Staging: iio: max1363 Fix two bugs in single_channel_from_ringJonathan Cameron2010-05-181-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch contains fixes for the two bugs Michael pointed out last week. As the other suggestion Michael made is not a bug fix (just a much more sensible way of handling things), I'll do that as a separate patch soon. The bugs were introduced with the abi changes. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Reported-by: Michael Hennerich <Michael.Hennerich@analog.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * Staging: iio: adis16220 extract bin_attribute structures from stateJonathan Cameron2010-05-182-53/+56
| | | | | | | | | | | | | | | Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * Staging: iio: adis16220 vibration sensor driverBarry Song2010-05-185-0/+830
| | | | | | | | | | | | | | | | | | Signed-off-by: Barry Song <Barry.Song@analog.com> Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * Staging: comedi: Kconfig dependancy fixesAlexander Kurz2010-05-181-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are three minor changes I would like to do on my last patch: * Comedi is formally not dependant on any hardware, e.g. it is possible to use comedi_test without (PCI || PCMCIA || PCCARD || USB || ISA) * comedi_parport is not dependant on PARPORT_PC. * indirect ni_mio_cs (16-bit PCMCIA) dependancy on mite PCI-chip may confuse users, thus changing COMEDI_NI_TIO depends on COMEDI_MITE to select COMEDI_MITE. Signed-off-by: Alexander Kurz <linux@kbdbabel.org> Cc: Ian Abbott <abbotti@mev.co.uk> Cc: Frank Mori Hess <fmhess@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * Staging: comedi: fix up build error from last Kconfig changesGreg Kroah-Hartman2010-05-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need the 8255 module to be present for some PCI comedi modules. So for now, just build the thing. We need some better Kconfig rules to figure this out properly. Cc: Alexander Kurz <linux@blala.de> Cc: Ian Abbott <abbotti@mev.co.uk> Cc: Frank Mori Hess <fmhess@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * Staging: comedi: new Kconfig and Makefiles, drivers grouped by bustype.Alexander Kurz2010-05-183-130/+1402
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PC/104-drivers went into ISA, PC/104+ went into PCI, Drivers without a bustype went into "misc". In doubt drivers supporting both ISA/PCI went into PCI. Drivers without any detailed hardware info went into ISA, e.g. fl512.c Some NI drivers are used by other NI drivers from different bustypes are grouped seperately in NI_COMMON. [tweaked by gregkh to handle the new driver recently added] Signed-off-by: Alexander Kurz <linux@kbdbabel.org> Acked-by: Ian Abbott <abbotti@mev.co.uk> Cc: Frank Mori Hess <fmhess@speakeasy.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * Staging: wlan-ng prism2usb: add suspend/resumeChristoph Fritz2010-05-171-0/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | There is no need trying to load the (even in most cases) not availible firmware after suspend. This saves about 30 secounds on reset waiting for timeout. Signed-off-by: Christoph Fritz <chf.fritz@googlemail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * staging: hv: Added heartbeat functionality to hv_utilsHank Janssen2010-05-174-3/+92
| | | | | | | | | | | | | | | | | | | | | | | | Add heartbeat functionality to hv_utils/Hyper-V 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>
| | * Staging: Use kmemdupJulia Lawall2010-05-1716-45/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use kmemdup when some other buffer is immediately copied into the allocated region. A simplified version of the semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // <smpl> @@ expression from,to,size,flag; statement S; @@ - to = \(kmalloc\|kzalloc\)(size,flag); + to = kmemdup(from,size,flag); if (to==NULL || ...) S - memcpy(to, from, size); // </smpl> Signed-off-by: Julia Lawall <julia@diku.dk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * Staging: vt6655: use ETH_HLEN macro instead of custom oneCharles Clément2010-05-173-14/+12
| | | | | | | | | | | | | | | | | | | | | | | | Replaced custom header length definition U_HEADER_LEN by ETH_HLEN from <linux/if_ether.h>. Also remove unused U_TYPE_LEN. Signed-off-by: Charles Clément <caratorn@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * Staging: vt6655: use ETH_ALEN macro instead of custom oneCharles Clément2010-05-1719-96/+96
| | | | | | | | | | | | | | | | | | | | | | | | Replaced custom ethernet address length definition U_ETHER_ADDR_LEN by ETH_ALEN from <linux/if_ether.h>. Signed-off-by: Charles Clément <caratorn@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * Staging: Use kcalloc or kzallocJulia Lawall2010-05-1449-142/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use kcalloc or kzalloc rather than the combination of kmalloc and memset. The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // <smpl> @@ expression x,y,flags; statement S; type T; @@ x = - kmalloc + kcalloc ( - y * sizeof(T), + y, sizeof(T), flags); if (x == NULL) S -memset(x, 0, y * sizeof(T)); @@ expression x,size,flags; statement S; @@ -x = kmalloc(size,flags); +x = kzalloc(size,flags); if (x == NULL) S -memset(x, 0, size); // </smpl> Signed-off-by: Julia Lawall <julia@diku.dk>
| | * Staging: udlfb: fix coding style issuesSoeren Moeller2010-05-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | This is a patch to the file udlfb.c that fixes a missing KERN_INFO and removes one whitespace before a newline. Signed-off-by: Soeren Moeller <soerenmoeller2001@gmail.com> Cc: Bernie Thompson <bernie@plugable.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * Staging: dt3155v4l: introduce state machineMarin Mitov2010-05-143-23/+69
| | | | | | | | | | | | | | | | | | | | | | | | This patch introduces a v4l2 state machine, so now CONFIG_DT3155_STREAMING is no more needed. Signed-off-by: Marin Mitov <mitov@issp.bas.bg> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * Staging: rtl8187se: fixed C99 comments style issues in r8180_core.cPrashant P. Shah2010-05-141-223/+233
| | | | | | | | | | | | | | | | | | | | | | | | This is a patch to the r8180_core.c file that fixes the C99 comments style issues found by the checkpatch.pl tool. Signed-off-by: Prashant P. Shah <pshah.mumbai@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * Staging: rtl8187se: fixed space style issues in r8180_core.cPrashant P. Shah2010-05-141-816/+806
| | | | | | | | | | | | | | | | | | | | | | | | This is a patch to the r8180_core.c file that fixes the space style issues found by the checkpatch.pl tool. Signed-off-by: Prashant P. Shah <pshah.mumbai@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * staging: hv: Fix error checking in channel.cHaiyang Zhang2010-05-141-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed errors in return value checking code, which caused vmbus channel not functioning. Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> Signed-off-by: Hank Janssen <hjanssen@microsoft.com> Cc: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * Staging: rtl8192su: led updateFlorian Schilhabel2010-05-141-8/+19
| | | | | | | | | | | | | | | | | | | | | | | | derived from Realteks driver. leds are now working. Signed-off-by: Florian Schilhabel <florian.c.schilhabel@googlemail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * Staging: rtl819su: added r8192SU_led.c/.hFlorian Schilhabel2010-05-145-26/+2466
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added the necessary infrastructure for the leds on the device this is a port from Realteks driver. leds are now working partially. Signed-off-by: Florian Schilhabel <florian.c.schilhabel@googlemail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * Staging: comedi: Fixed more long line lengths in comedi.hMark Rankilor2010-05-141-5/+10
| | | | | | | | | | | | | | | | | | | | | This patches fixes some long line lengths in comedi.h from checkpatch.pl Signed-off-by: Mark Rankilor <reodge@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * Staging: comedi: Fixed long line lengths in comedi.hMark Rankilor2010-05-141-14/+18
| | | | | | | | | | | | | | | | | | | | | | | | This patches fixes long line lengths in comedi.h that were picked up by checkpatch.pl Signed-off-by: Mark Rankilor <reodge@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * staging: comedi PCMCIA-drivers: adding MODULE_AUTHOR, MODULE_DESCRIPTION and ↵Alexander Kurz2010-05-147-5/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MODULE_LICENSE this adds and sorts the module labels MODULE_AUTHOR, MODULE_DESCRIPTION and MODULE_LICENSE for all comedi PCMCIA drivers. Signed-off-by: Alexander Kurz <linux@kbdbabel.org> Cc: Frank Mori Hess <fmhess@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * Staging: comedi: Fix long line lengths in comedi_fops.cMark2010-05-141-15/+29
| | | | | | | | | | | | | | | | | | | | | | | | This patch fixes lots of long line lengths in comedi_fops.c found by checkpatch.pl Signed-off-by: Mark Rankilor <reodge@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * Staging: wlags49_hs2: Fix wlags49_hs2 driver after build fixes broke itHenk de Groot2010-05-146-76/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes the driver after merge into the 2.6.34 kernel. Driver should be functional again (a fix to make it compile broke the driver). Patch against 2.6.34 RC7 with patch-v2.6.34-rc7-next-20100513 already applied. Removed conditional code based on kernel version, this is pointless now the driver is part of the kernel. Also removed obsolte code left over from previous patches. Includes also small fixes to compile clean again. Signed-off-by: Henk de Groot <pe1dnn@amsat.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * Staging: ramzswap: Remove backing swap supportNitin Gupta2010-05-143-685/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, each ramzswap device can be assigned a separate 'backing swap' file/partition. The ramzswap driver forwards swap I/O requests to this backing swap whenever an incompressible page is found. This feature adds nearly 700 lines of code and it also duplicates much of the swapon() functionality (for example, finding swap extents and so on). Removing this code makes the driver much simpler and should help its transition from staging to stable drivers area (drivers/block/). Similar functionality may be implemented if we can implement migrating pages across swap devices but the details have not yet been worked out. Support for _partitions_ as backing swap could be retained as it requires a few lines of code only. This part can be re-introduced later if above swap migration method turns out to be infeasible. More cleanups and code comments will be added soon. Signed-off-by: Nitin Gupta <ngupta@vflare.org> Acked-by: Pekka Enberg <penberg@cs.helsinki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * Staging: vt6655: remove OUT definitionCharles Clément2010-05-1419-114/+114
| | | | | | | | | | | | | | | | | | | | | Remove empty OUT definition used to specify output parameters. Signed-off-by: Charles Clément <caratorn@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * Staging: vt6655: remove IN definitionCharles Clément2010-05-1436-1059/+1055
| | | | | | | | | | | | | | | | | | | | | Remove empty IN definition used to specify input parameters. Signed-off-by: Charles Clément <caratorn@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * staging: vt6656: code cleanup, removed unused I8 macroAndres More2010-05-141-7/+0
| | | | | | | | | | | | | | | | | | | | | Removed custom macro for signed 8-bit integers, which was not used. Signed-off-by: Andres More <more.andres@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>