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>

3 files changed, 6 insertions, 10 deletions

diff --git a/drivers/staging/cx25821/cx25821-audio-upstream.c b/drivers/staging/cx25821/cx25821-audio-upstream.c
index 6a4e8720b47..eb39d13f7d7 100644
--- a/drivers/staging/cx25821/cx25821-audio-upstream.c
+++ b/drivers/staging/cx25821/cx25821-audio-upstream.c
@@ -753,8 +753,7 @@ int cx25821_audio_upstream_init(struct cx25821_dev *dev, int channel_select)
 
         if (dev->input_audiofilename) {
                 str_length = strlen(dev->input_audiofilename);
-                dev->_audiofilename =
-                    (char *)kmalloc(str_length + 1, GFP_KERNEL);
+                dev->_audiofilename = kmalloc(str_length + 1, GFP_KERNEL);
 
                 if (!dev->_audiofilename)
                         goto error;
@@ -768,8 +767,7 @@ int cx25821_audio_upstream_init(struct cx25821_dev *dev, int channel_select)
                 }
         } else {
                 str_length = strlen(_defaultAudioName);
-                dev->_audiofilename =
-                    (char *)kmalloc(str_length + 1, GFP_KERNEL);
+                dev->_audiofilename = kmalloc(str_length + 1, GFP_KERNEL);
 
                 if (!dev->_audiofilename)
                         goto error;
diff --git a/drivers/staging/cx25821/cx25821-video-upstream-ch2.c b/drivers/staging/cx25821/cx25821-video-upstream-ch2.c
index cc51618cffa..343df6619fe 100644
--- a/drivers/staging/cx25821/cx25821-video-upstream-ch2.c
+++ b/drivers/staging/cx25821/cx25821-video-upstream-ch2.c
@@ -769,8 +769,7 @@ int cx25821_vidupstream_init_ch2(struct cx25821_dev *dev, int channel_select,
 
         if (dev->input_filename_ch2) {
                 str_length = strlen(dev->input_filename_ch2);
-                dev->_filename_ch2 =
-                    (char *)kmalloc(str_length + 1, GFP_KERNEL);
+                dev->_filename_ch2 = kmalloc(str_length + 1, GFP_KERNEL);
 
                 if (!dev->_filename_ch2)
                         goto error;
@@ -779,8 +778,7 @@ int cx25821_vidupstream_init_ch2(struct cx25821_dev *dev, int channel_select,
                        str_length + 1);
         } else {
                 str_length = strlen(dev->_defaultname_ch2);
-                dev->_filename_ch2 =
-                    (char *)kmalloc(str_length + 1, GFP_KERNEL);
+                dev->_filename_ch2 = kmalloc(str_length + 1, GFP_KERNEL);
 
                 if (!dev->_filename_ch2)
                         goto error;
diff --git a/drivers/staging/cx25821/cx25821-video-upstream.c b/drivers/staging/cx25821/cx25821-video-upstream.c
index c842d8f3d69..7a3dad91eba 100644
--- a/drivers/staging/cx25821/cx25821-video-upstream.c
+++ b/drivers/staging/cx25821/cx25821-video-upstream.c
@@ -830,7 +830,7 @@ int cx25821_vidupstream_init_ch1(struct cx25821_dev *dev, int channel_select,
 
         if (dev->input_filename) {
                 str_length = strlen(dev->input_filename);
-                dev->_filename = (char *)kmalloc(str_length + 1, GFP_KERNEL);
+                dev->_filename = kmalloc(str_length + 1, GFP_KERNEL);
 
                 if (!dev->_filename)
                         goto error;
@@ -838,7 +838,7 @@ int cx25821_vidupstream_init_ch1(struct cx25821_dev *dev, int channel_select,
                 memcpy(dev->_filename, dev->input_filename, str_length + 1);
         } else {
                 str_length = strlen(dev->_defaultname);
-                dev->_filename = (char *)kmalloc(str_length + 1, GFP_KERNEL);
+                dev->_filename = kmalloc(str_length + 1, GFP_KERNEL);
 
                 if (!dev->_filename)
                         goto error;