tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

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

Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Jesper Juhl and committed by
Linus Torvalds 4fa95ef6 7f927fcc

+12 -7
unified split
+4 -2
sound/core/rawmidi.c
··· 631 return -EINVAL; 632 } 633 if (params->buffer_size != runtime->buffer_size) { 634 - if ((newbuf = (char *) kmalloc(params->buffer_size, GFP_KERNEL)) == NULL) 635 return -ENOMEM; 636 kfree(runtime->buffer); 637 runtime->buffer = newbuf; ··· 658 return -EINVAL; 659 } 660 if (params->buffer_size != runtime->buffer_size) { 661 - if ((newbuf = (char *) kmalloc(params->buffer_size, GFP_KERNEL)) == NULL) 662 return -ENOMEM; 663 kfree(runtime->buffer); 664 runtime->buffer = newbuf;
··· 631 return -EINVAL; 632 } 633 if (params->buffer_size != runtime->buffer_size) { 634 + newbuf = kmalloc(params->buffer_size, GFP_KERNEL); 635 + if (!newbuf) 636 return -ENOMEM; 637 kfree(runtime->buffer); 638 runtime->buffer = newbuf; ··· 657 return -EINVAL; 658 } 659 if (params->buffer_size != runtime->buffer_size) { 660 + newbuf = kmalloc(params->buffer_size, GFP_KERNEL); 661 + if (!newbuf) 662 return -ENOMEM; 663 kfree(runtime->buffer); 664 runtime->buffer = newbuf;
+1 -1
sound/oss/dmasound/dmasound_awacs.c
··· 2798 DBDMA_ALIGN(beep_dbdma_cmd_space); 2799 /* set up emergency dbdma cmd */ 2800 emergency_dbdma_cmd = beep_dbdma_cmd+1 ; 2801 - beep_buf = (short *) kmalloc(BEEP_BUFLEN * 4, GFP_KERNEL); 2802 if (beep_buf == NULL) { 2803 printk(KERN_ERR "dmasound_pmac: no memory for beep buffer\n"); 2804 kfree(beep_dbdma_cmd_space) ;
··· 2798 DBDMA_ALIGN(beep_dbdma_cmd_space); 2799 /* set up emergency dbdma cmd */ 2800 emergency_dbdma_cmd = beep_dbdma_cmd+1 ; 2801 + beep_buf = kmalloc(BEEP_BUFLEN * 4, GFP_KERNEL); 2802 if (beep_buf == NULL) { 2803 printk(KERN_ERR "dmasound_pmac: no memory for beep buffer\n"); 2804 kfree(beep_dbdma_cmd_space) ;
+6 -3
sound/oss/emu10k1/midi.c
··· 65 66 init_midi_hdr(midihdr); 67 68 - if ((midihdr->data = (u8 *) kmalloc(MIDIIN_BUFLEN, GFP_KERNEL)) == NULL) { 69 ERROR(); 70 kfree(midihdr); 71 return -1; ··· 335 midihdr->bytesrecorded = 0; 336 midihdr->flags = 0; 337 338 - if ((midihdr->data = (u8 *) kmalloc(count, GFP_KERNEL)) == NULL) { 339 ERROR(); 340 kfree(midihdr); 341 return -EINVAL; ··· 547 midihdr->bytesrecorded = 0; 548 midihdr->flags = 0; 549 550 - if ((midihdr->data = (u8 *) kmalloc(1, GFP_KERNEL)) == NULL) { 551 ERROR(); 552 kfree(midihdr); 553 return -EINVAL;
··· 65 66 init_midi_hdr(midihdr); 67 68 + midihdr->data = kmalloc(MIDIIN_BUFLEN, GFP_KERNEL); 69 + if (!midihdr->data) { 70 ERROR(); 71 kfree(midihdr); 72 return -1; ··· 334 midihdr->bytesrecorded = 0; 335 midihdr->flags = 0; 336 337 + midihdr->data = kmalloc(count, GFP_KERNEL); 338 + if (!midihdr->data) { 339 ERROR(); 340 kfree(midihdr); 341 return -EINVAL; ··· 545 midihdr->bytesrecorded = 0; 546 midihdr->flags = 0; 547 548 + midihdr->data = kmalloc(1, GFP_KERNEL); 549 + if (!midihdr->data) { 550 ERROR(); 551 kfree(midihdr); 552 return -EINVAL;
+1 -1
sound/oss/sh_dac_audio.c
··· 289 290 in_use = 0; 291 292 - data_buffer = (char *)kmalloc(BUFFER_SIZE, GFP_KERNEL); 293 if (data_buffer == NULL) 294 return -ENOMEM; 295
··· 289 290 in_use = 0; 291 292 + data_buffer = kmalloc(BUFFER_SIZE, GFP_KERNEL); 293 if (data_buffer == NULL) 294 return -ENOMEM; 295