Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4fa95ef6 authored by Jesper Juhl's avatar Jesper Juhl Committed by Linus Torvalds
Browse files

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



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

Signed-off-by: default avatarJesper Juhl <jesper.juhl@gmail.com>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 7f927fcc

sound/core/rawmidi.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -631,7 +631,8 @@ int snd_rawmidi_output_params(struct snd_rawmidi_substream *substream, 
		return -EINVAL;

		return -EINVAL;

	}

	}

	if (params->buffer_size != runtime->buffer_size) {

	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;

			return -ENOMEM;

		kfree(runtime->buffer);

		kfree(runtime->buffer);

		runtime->buffer = newbuf;

		runtime->buffer = newbuf;
@@ -657,7 +658,8 @@ int snd_rawmidi_input_params(struct snd_rawmidi_substream *substream, 
		return -EINVAL;

		return -EINVAL;

	}

	}

	if (params->buffer_size != runtime->buffer_size) {

	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;

			return -ENOMEM;

		kfree(runtime->buffer);

		kfree(runtime->buffer);

		runtime->buffer = newbuf;

		runtime->buffer = newbuf;

sound/oss/dmasound/dmasound_awacs.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2798,7 +2798,7 @@ __init setup_beep(void) 
			DBDMA_ALIGN(beep_dbdma_cmd_space);

			DBDMA_ALIGN(beep_dbdma_cmd_space);

	/* set up emergency dbdma cmd */

	/* set up emergency dbdma cmd */

	emergency_dbdma_cmd = beep_dbdma_cmd+1 ;

	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) {

	if (beep_buf == NULL) {

		printk(KERN_ERR "dmasound_pmac: no memory for beep buffer\n");

		printk(KERN_ERR "dmasound_pmac: no memory for beep buffer\n");

		kfree(beep_dbdma_cmd_space) ;

		kfree(beep_dbdma_cmd_space) ;

sound/oss/emu10k1/midi.c

+6 −3
Original line number Original line Diff line number Diff line
@@ -65,7 +65,8 @@ static int midiin_add_buffer(struct emu10k1_mididevice *midi_dev, struct midi_hd 




	init_midi_hdr(midihdr);

	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();

		ERROR();

		kfree(midihdr);

		kfree(midihdr);

		return -1;

		return -1;
@@ -334,7 +335,8 @@ static ssize_t emu10k1_midi_write(struct file *file, const char __user *buffer, 
	midihdr->bytesrecorded = 0;

	midihdr->bytesrecorded = 0;

	midihdr->flags = 0;

	midihdr->flags = 0;





	if ((midihdr->data = (u8 *) kmalloc(count, GFP_KERNEL)) == NULL) {

	midihdr->data = kmalloc(count, GFP_KERNEL);

	if (!midihdr->data) {

		ERROR();

		ERROR();

		kfree(midihdr);

		kfree(midihdr);

		return -EINVAL;

		return -EINVAL;
@@ -545,7 +547,8 @@ int emu10k1_seq_midi_out(int dev, unsigned char midi_byte) 
	midihdr->bytesrecorded = 0;

	midihdr->bytesrecorded = 0;

	midihdr->flags = 0;

	midihdr->flags = 0;





	if ((midihdr->data = (u8 *) kmalloc(1, GFP_KERNEL)) == NULL) {

	midihdr->data = kmalloc(1, GFP_KERNEL);

	if (!midihdr->data) {

		ERROR();

		ERROR();

		kfree(midihdr);

		kfree(midihdr);

		return -EINVAL;

		return -EINVAL;

sound/oss/sh_dac_audio.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -289,7 +289,7 @@ static int __init dac_audio_init(void) 




	in_use = 0;

	in_use = 0;





	data_buffer = (char *)kmalloc(BUFFER_SIZE, GFP_KERNEL);

	data_buffer = kmalloc(BUFFER_SIZE, GFP_KERNEL);

	if (data_buffer == NULL)

	if (data_buffer == NULL)

		return -ENOMEM;

		return -ENOMEM;