[PATCH 6/6] sound: Remove unneeded kmalloc() return value casts

[Jesper Juhl]

Get rid of unnessesary casts of kmalloc() return value in sound/


Signed-off-by: Jesper Juhl <jesper.juhl@xxxxxxxxx>
---

 sound/core/rawmidi.c                |    6 ++++--
 sound/oss/dmasound/dmasound_awacs.c |    2 +-
 sound/oss/emu10k1/midi.c            |    9 ++++++---
 sound/oss/sh_dac_audio.c            |    2 +-
 4 files changed, 12 insertions(+), 7 deletions(-)

--- linux-2.6.15-rc5-git1-orig/sound/core/rawmidi.c	2005-12-04 18:49:03.000000000 +0100
+++ linux-2.6.15-rc5-git1/sound/core/rawmidi.c	2005-12-11 19:33:29.000000000 +0100
@@ -619,7 +619,8 @@ int snd_rawmidi_output_params(snd_rawmid
 		return -EINVAL;
 	}
 	if (params->buffer_size != runtime->buffer_size) {
-		if ((newbuf = (char *) kmalloc(params->buffer_size, GFP_KERNEL)) == NULL)
+		newbuf = kmalloc(params->buffer_size, GFP_KERNEL);
+		if (!newbuf)
 			return -ENOMEM;
 		kfree(runtime->buffer);
 		runtime->buffer = newbuf;
@@ -644,7 +645,8 @@ int snd_rawmidi_input_params(snd_rawmidi
 		return -EINVAL;
 	}
 	if (params->buffer_size != runtime->buffer_size) {
-		if ((newbuf = (char *) kmalloc(params->buffer_size, GFP_KERNEL)) == NULL)
+		newbuf = kmalloc(params->buffer_size, GFP_KERNEL);
+		if (!newbuf)
 			return -ENOMEM;
 		kfree(runtime->buffer);
 		runtime->buffer = newbuf;
--- linux-2.6.15-rc5-git1-orig/sound/oss/dmasound/dmasound_awacs.c	2005-12-04 18:49:06.000000000 +0100
+++ linux-2.6.15-rc5-git1/sound/oss/dmasound/dmasound_awacs.c	2005-12-11 19:36:03.000000000 +0100
@@ -2796,7 +2796,7 @@ __init setup_beep(void)
 			DBDMA_ALIGN(beep_dbdma_cmd_space);
 	/* set up emergency dbdma cmd */
 	emergency_dbdma_cmd = beep_dbdma_cmd+1 ;
-	beep_buf = (short *) kmalloc(BEEP_BUFLEN * 4, GFP_KERNEL);
+	beep_buf = kmalloc(BEEP_BUFLEN * 4, GFP_KERNEL);
 	if (beep_buf == NULL) {
 		printk(KERN_ERR "dmasound_pmac: no memory for beep buffer\n");
 		kfree(beep_dbdma_cmd_space) ;
--- linux-2.6.15-rc5-git1-orig/sound/oss/sh_dac_audio.c	2005-12-04 18:49:06.000000000 +0100
+++ linux-2.6.15-rc5-git1/sound/oss/sh_dac_audio.c	2005-12-11 19:37:48.000000000 +0100
@@ -289,7 +289,7 @@ static int __init dac_audio_init(void)
 
 	in_use = 0;
 
-	data_buffer = (char *)kmalloc(BUFFER_SIZE, GFP_KERNEL);
+	data_buffer = kmalloc(BUFFER_SIZE, GFP_KERNEL);
 	if (data_buffer == NULL)
 		return -ENOMEM;
 
--- linux-2.6.15-rc5-git1-orig/sound/oss/emu10k1/midi.c	2005-10-28 02:02:08.000000000 +0200
+++ linux-2.6.15-rc5-git1/sound/oss/emu10k1/midi.c	2005-12-11 19:40:12.000000000 +0100
@@ -65,7 +65,8 @@ static int midiin_add_buffer(struct emu1
 
 	init_midi_hdr(midihdr);
 
-	if ((midihdr->data = (u8 *) kmalloc(MIDIIN_BUFLEN, GFP_KERNEL)) == NULL) {
+	midihdr->data = kmalloc(MIDIIN_BUFLEN, GFP_KERNEL);
+	if (!midihdr->data) {
 		ERROR();
 		kfree(midihdr);
 		return -1;
@@ -334,7 +335,8 @@ static ssize_t emu10k1_midi_write(struct
 	midihdr->bytesrecorded = 0;
 	midihdr->flags = 0;
 
-	if ((midihdr->data = (u8 *) kmalloc(count, GFP_KERNEL)) == NULL) {
+	midihdr->data = kmalloc(count, GFP_KERNEL);
+	if (!midihdr->data) {
 		ERROR();
 		kfree(midihdr);
 		return -EINVAL;
@@ -545,7 +547,8 @@ int emu10k1_seq_midi_out(int dev, unsign
 	midihdr->bytesrecorded = 0;
 	midihdr->flags = 0;
 
-	if ((midihdr->data = (u8 *) kmalloc(1, GFP_KERNEL)) == NULL) {
+	midihdr->data = kmalloc(1, GFP_KERNEL);
+	if (!midihdr->data) {
 		ERROR();
 		kfree(midihdr);
 		return -EINVAL;


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/