From: Jesper Juhl Get rid of unnessesary casts of kmalloc() return value in sound/ Signed-off-by: Jesper Juhl Cc: Jaroslav Kysela Cc: Takashi Iwai Signed-off-by: Andrew Morton --- 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(-) diff -puN sound/core/rawmidi.c~sound-remove-unneeded-kmalloc-return-value-casts sound/core/rawmidi.c --- devel/sound/core/rawmidi.c~sound-remove-unneeded-kmalloc-return-value-casts 2006-03-11 18:57:42.000000000 -0800 +++ devel-akpm/sound/core/rawmidi.c 2006-03-11 18:57:42.000000000 -0800 @@ -631,7 +631,8 @@ int snd_rawmidi_output_params(struct snd 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; @@ -657,7 +658,8 @@ int snd_rawmidi_input_params(struct snd_ 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; diff -puN sound/oss/dmasound/dmasound_awacs.c~sound-remove-unneeded-kmalloc-return-value-casts sound/oss/dmasound/dmasound_awacs.c --- devel/sound/oss/dmasound/dmasound_awacs.c~sound-remove-unneeded-kmalloc-return-value-casts 2006-03-11 18:57:42.000000000 -0800 +++ devel-akpm/sound/oss/dmasound/dmasound_awacs.c 2006-03-11 18:57:42.000000000 -0800 @@ -2800,7 +2800,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) ; diff -puN sound/oss/emu10k1/midi.c~sound-remove-unneeded-kmalloc-return-value-casts sound/oss/emu10k1/midi.c --- devel/sound/oss/emu10k1/midi.c~sound-remove-unneeded-kmalloc-return-value-casts 2006-03-11 18:57:42.000000000 -0800 +++ devel-akpm/sound/oss/emu10k1/midi.c 2006-03-11 18:57:42.000000000 -0800 @@ -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; diff -puN sound/oss/sh_dac_audio.c~sound-remove-unneeded-kmalloc-return-value-casts sound/oss/sh_dac_audio.c --- devel/sound/oss/sh_dac_audio.c~sound-remove-unneeded-kmalloc-return-value-casts 2006-03-11 18:57:42.000000000 -0800 +++ devel-akpm/sound/oss/sh_dac_audio.c 2006-03-11 18:57:42.000000000 -0800 @@ -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; _