[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>
This commit is contained in:
Родитель
7f927fcc2f
Коммит
4fa95ef639
|
@ -631,7 +631,8 @@ int snd_rawmidi_output_params(struct snd_rawmidi_substream *substream,
|
|||
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_rawmidi_substream *substream,
|
|||
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;
|
||||
|
|
|
@ -2798,7 +2798,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) ;
|
||||
|
|
|
@ -65,7 +65,8 @@ static int midiin_add_buffer(struct emu10k1_mididevice *midi_dev, struct midi_hd
|
|||
|
||||
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 file *file, const char __user *buffer,
|
|||
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, unsigned char midi_byte)
|
|||
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;
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче