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

Commit 24db8bba authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: seq: Drop superfluous error/debug messages after malloc failures 



The kernel memory allocators already report the errors when the
requested allocation fails, thus we don't need to warn it again in
each caller side.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 8d98a067

sound/core/seq/seq_fifo.c

+1 −3
Original line number Diff line number Diff line
@@ -33,10 +33,8 @@ struct snd_seq_fifo *snd_seq_fifo_new(int poolsize) 
	struct snd_seq_fifo *f;



	f = kzalloc(sizeof(*f), GFP_KERNEL);

	if (f == NULL) {

		pr_debug("ALSA: seq: malloc failed for snd_seq_fifo_new() \n");

	if (!f)

		return NULL;

	}



	f->pool = snd_seq_pool_new(poolsize);

	if (f->pool == NULL) {

sound/core/seq/seq_memory.c

+2 −6
Original line number Diff line number Diff line
@@ -387,10 +387,8 @@ int snd_seq_pool_init(struct snd_seq_pool *pool) 
		return 0;



	pool->ptr = vmalloc(sizeof(struct snd_seq_event_cell) * pool->size);

	if (pool->ptr == NULL) {

		pr_debug("ALSA: seq: malloc for sequencer events failed\n");

	if (!pool->ptr)

		return -ENOMEM;

	}



	/* add new cells to the free cell list */

	spin_lock_irqsave(&pool->lock, flags);
@@ -463,10 +461,8 @@ struct snd_seq_pool *snd_seq_pool_new(int poolsize) 


	/* create pool block */

	pool = kzalloc(sizeof(*pool), GFP_KERNEL);

	if (pool == NULL) {

		pr_debug("ALSA: seq: malloc failed for pool\n");

	if (!pool)

		return NULL;

	}

	spin_lock_init(&pool->lock);

	pool->ptr = NULL;

	pool->free = NULL;

sound/core/seq/seq_ports.c

+1 −3
Original line number Diff line number Diff line
@@ -141,10 +141,8 @@ struct snd_seq_client_port *snd_seq_create_port(struct snd_seq_client *client, 


	/* create a new port */

	new_port = kzalloc(sizeof(*new_port), GFP_KERNEL);

	if (! new_port) {

		pr_debug("ALSA: seq: malloc failed for registering client port\n");

	if (!new_port)

		return NULL;	/* failure, out of memory */

	}

	/* init port data */

	new_port->addr.client = client->number;

	new_port->addr.port = -1;

sound/core/seq/seq_prioq.c

+1 −3
Original line number Diff line number Diff line
@@ -59,10 +59,8 @@ struct snd_seq_prioq *snd_seq_prioq_new(void) 
	struct snd_seq_prioq *f;



	f = kzalloc(sizeof(*f), GFP_KERNEL);

	if (f == NULL) {

		pr_debug("ALSA: seq: malloc failed for snd_seq_prioq_new()\n");

	if (!f)

		return NULL;

	}

	

	spin_lock_init(&f->lock);

	f->head = NULL;

sound/core/seq/seq_queue.c

+1 −3
Original line number Diff line number Diff line
@@ -111,10 +111,8 @@ static struct snd_seq_queue *queue_new(int owner, int locked) 
	struct snd_seq_queue *q;



	q = kzalloc(sizeof(*q), GFP_KERNEL);

	if (q == NULL) {

		pr_debug("ALSA: seq: malloc failed for snd_seq_queue_new()\n");

	if (!q)

		return NULL;

	}



	spin_lock_init(&q->owner_lock);

	spin_lock_init(&q->check_lock);