leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
200,769 Commits 2 Branches 0 Tags
2ece3684b4037ad2394de795d67abbe412ab5e2f
Commit Graph

320 Commits

Author SHA1 Message Date
Greg Kroah-Hartman
c8d1a12692 Merge staging-next tree into Linus's latest version 
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>
 2010-05-21 12:48:55 -07:00
Hank Janssen
9153f7b997 staging: hv: Added heartbeat functionality to hv_utils 
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>
 2010-05-17 16:32:30 -07:00
Julia Lawall
94002c07ff Staging: Use kmemdup 
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>
 2010-05-17 16:31:15 -07:00
Haiyang Zhang
fd4dc88e46 staging: hv: Fix error checking in channel.c 
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>
 2010-05-14 13:57:56 -07:00
K. Y. Srinivasan
06e719d80f Staging: hv: auto-load MSFT PV NIC driver 
Signed-off-by: K. Y. Srinivasan <ksrinivasan@novell.com>
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-14 13:11:30 -07:00
Haiyang Zhang
e9ec36030c staging: hv: Optimize adj_guesttime function and add more detailed comments 
Credits go to Joe Perches <joe@perches.com> for suggesting the changes.

Cc: Joe Perches <joe@perches.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 15:31:52 -07:00
Stephen Hemminger
3afc7cc38c Staging: hv: storvsc module descriptions 
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 14:15:34 -07:00
Stephen Hemminger
48c9f7c30b Staging: hv: block_operations can be const 
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 14:15:34 -07:00
Stephen Hemminger
1ec28abbf8 Staging: hv: add module description to blkvsc 
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 14:15:34 -07:00
Greg Kroah-Hartman
2d82f6c734 Staging: hv: rename VersionInfo.h to version_info.h 
The great renaming of the hv code is now complete.

Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:18 -07:00
Greg Kroah-Hartman
f8e5add228 Staging: hv: rename VmbusPacketFormat.h to vmbus_packet_format.h 
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:18 -07:00
Greg Kroah-Hartman
0e0ab5f5af Staging: hv: rename VmbusChannelInterface.h to vmbus_channel_interface.h 
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:17 -07:00
Greg Kroah-Hartman
72daf320fb Staging: hv: rename VmbusPrivate.h to vmbus_private.h 
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:17 -07:00
Greg Kroah-Hartman
447fc67e7a Staging: hv: rename VmbusApi.h to vmbus_api.h 
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:17 -07:00
Greg Kroah-Hartman
bb96979310 Staging: hv: rename StorVscApi.h to storvsc_api.h 
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:17 -07:00
Greg Kroah-Hartman
a82c7a2ad6 Staging: hv: rename NetVscApi.h to netvsc_api.h 
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:17 -07:00
Greg Kroah-Hartman
5496c9c31d Staging: hv: rename ChannelInterface.c and .h to channel_interface.c and .h 
All of the uppercase .c files are now gone.

Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:17 -07:00
Greg Kroah-Hartman
ff39524bc4 Staging: hv: rename ChannelMgmt.c and .h to channel_mgmt.c and .h 
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:17 -07:00
Greg Kroah-Hartman
043efcc31e Staging: hv: rename RndisFilter.c and .h to rndis_filter.c and .h 
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:17 -07:00
Greg Kroah-Hartman
a73fd9802e Staging: hv: rename StorVsc.c to storvsc.c 
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:17 -07:00
Greg Kroah-Hartman
af167ae9b2 Staging: hv: rename NetVsc.c and .h to netvsc.c and .h 
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:16 -07:00
Greg Kroah-Hartman
98109c5a96 Staging: hv: rename Vmbus.c to vmbus.c 
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:16 -07:00
Greg Kroah-Hartman
376a045f3a Staging: hv: rename BlkVsc.c to blkvsc.c 
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:16 -07:00
Greg Kroah-Hartman
8f078ca6e7 Staging: hv: rename RingBuffer.c and .h to ring_buffer.c and .h 
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:16 -07:00
Greg Kroah-Hartman
55e9643e6c Staging: hv: rename Connection.c to connection.c 
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:16 -07:00
Greg Kroah-Hartman
4df90be54d Staging: hv: rename Channel.c and .h to channel.c and .h 
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:16 -07:00
Greg Kroah-Hartman
7e8ad49f13 Staging: hv: rename Hv.h to hv.h 
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:16 -07:00
Greg Kroah-Hartman
0d695f2b8f Staging: hv: rename Hv.c to hv.c 
No CamelCase in file names.

Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:16 -07:00
Greg Kroah-Hartman
d2124f293b Staging: hv: rename hyperv_utils.c to hv_utils.c 
As the module only has one .c file in it, just name the file
the same as the desired module.

Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:16 -07:00
Greg Kroah-Hartman
25e2831dc4 Staging: hv: util.h: fix up space mess again 
Again, use tabs, not spaces, it's not difficult to remember...

Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:15 -07:00
Greg Kroah-Hartman
733371df3d Staging: hv: remove typedef that was just added. 
It's a u64, so use a u64, it's not some special typedef.

Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:15 -07:00
Haiyang Zhang
39c4e9c378 Staging: hv: Add Time Sync feature to hv_utils module. 
The Time Sync feature synchronizes guest time to host UTC time after reboot,
and restore from saved/paused state.

Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:15 -07:00
Greg Kroah-Hartman
e61fbe66cb Staging: hv: Channel.c: fix up compiler warning 
In the series of ASSERT removals, somehow we ended up with a compiler
warning in Channel.c.  This patch fixes that up.

Cc: Bill Pemberton <wfp5p@virginia.edu>
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:15 -07:00
Bill Pemberton
e8d5373d66 staging: hv: remove ASSERT in logging.h 
ASSERT is no longer used in hv, so remove the define

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:15 -07:00
Bill Pemberton
790696847d staging: hv: remove ASSERT() and return -EINVAL in NetVsc.c 
return -EINVAL instead of calling ASSERT()

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:15 -07:00
Bill Pemberton
7a09876d2a staging: hv: replace ASSERT() with WARN_ON() in NetVsc.c 
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:15 -07:00
Bill Pemberton
972b9529cc staging: hv: remove ASSERT()s 
These ASSERT()s serve no purpose other than for debugging.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:15 -07:00
Bill Pemberton
a3810b0ef6 staging: hv: remove ASSERT()s in vmbus_drv.c 
These ASSERT()s serve no purpose other than for debugging.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:15 -07:00
Bill Pemberton
a16e1485c7 staging: hv: remove ASSERT()s and return -EINVAL in RingBuffer.c 
return -EINVAL instead of calling ASSERT() for these conditionals.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:14 -07:00
Bill Pemberton
3324fb4053 staging: hv: check return value of RingBufferInit() 
RingBufferInit() would always return sucess and instead relied on an
ASSERT() to test for an error condition.  Remove the ASSERT() and
return -EINVAL instead.  The return value of RingBufferInit() was also
never checked, so check it.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:14 -07:00
Bill Pemberton
1bbdd7a538 staging: hv: remove ASSERT()s in RingBuffer.c 
These ASSERT()s serve no purpose other than for debugging.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:14 -07:00
Bill Pemberton
8a62d7168a staging: hv: remove ASSERT()s in RndisFilter.c 
return -EINVAL instead of calling ASSERT() for these conditionals.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:14 -07:00
Bill Pemberton
45e4431468 staging: hv: remove ASSERT()s in RndisFilter.c 
These ASSERT()s serve no purpose other than for debugging.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:14 -07:00
Bill Pemberton
e2e64432e9 staging: hv: remove ASSERT()s in StorVsc.c 
These ASSERT()s serve no purpose other than for debugging.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:14 -07:00
Bill Pemberton
4e5166b5d8 staging: hv: remove ASSERT()s in blkvsc_drv.c 
These ASSERT()s serve no purpose other than for debugging.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:14 -07:00
Bill Pemberton
5afd06ccd6 staging: hv: make the block driver depend on LBDAF 
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:14 -07:00
Bill Pemberton
ee3503762d staging: hv: return error instead calling ASSERT in blkvsc_drv.c 
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:14 -07:00
Bill Pemberton
b856e7382f staging: hv: remove ASSERT()s in storvsc_drv.c 
These ASSERT()s serve no purpose other than for debugging.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:14 -07:00
Bill Pemberton
0ace247ead staging: hv: remove ASSERT()s in Channel.c 
These ASSERT()s serve no purpose other than for debugging.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:13 -07:00
Bill Pemberton
002b53ea57 Staging: hv: return -EINVAL instead of calling ASSERT() 
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-05-11 11:36:13 -07:00