lkml.org 
[lkml]   [2016]   [Mar]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13.y-ckt 090/138] ALSA: seq: Drop superfluous error/debug messages after malloc failures
    Date
    3.13.11-ckt36 -stable review patch.  If anyone has any objections, please let me know.

    ---8<------------------------------------------------------------

    From: Takashi Iwai <tiwai@suse.de>

    commit 24db8bbaa3fcfaf0c2faccbff5864b58088ac1f6 upstream.

    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: Takashi Iwai <tiwai@suse.de>
    [ kamal: backport to 3.13-stable: context ]
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    sound/core/seq/seq_fifo.c | 4 +---
    sound/core/seq/seq_memory.c | 8 ++------
    sound/core/seq/seq_ports.c | 4 +---
    sound/core/seq/seq_prioq.c | 4 +---
    sound/core/seq/seq_queue.c | 4 +---
    sound/core/seq/seq_timer.c | 4 +---
    6 files changed, 7 insertions(+), 21 deletions(-)

    diff --git a/sound/core/seq/seq_fifo.c b/sound/core/seq/seq_fifo.c
    index 0d75afa..42c9bd8 100644
    --- a/sound/core/seq/seq_fifo.c
    +++ b/sound/core/seq/seq_fifo.c
    @@ -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) {
    - snd_printd("malloc failed for snd_seq_fifo_new() \n");
    + if (!f)
    return NULL;
    - }

    f->pool = snd_seq_pool_new(poolsize);
    if (f->pool == NULL) {
    diff --git a/sound/core/seq/seq_memory.c b/sound/core/seq/seq_memory.c
    index f478f77..99eaf4a 100644
    --- a/sound/core/seq/seq_memory.c
    +++ b/sound/core/seq/seq_memory.c
    @@ -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) {
    - snd_printd("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) {
    - snd_printd("seq: malloc failed for pool\n");
    + if (!pool)
    return NULL;
    - }
    spin_lock_init(&pool->lock);
    pool->ptr = NULL;
    pool->free = NULL;
    diff --git a/sound/core/seq/seq_ports.c b/sound/core/seq/seq_ports.c
    index 67c91d2..3bf67ec 100644
    --- a/sound/core/seq/seq_ports.c
    +++ b/sound/core/seq/seq_ports.c
    @@ -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) {
    - snd_printd("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;
    diff --git a/sound/core/seq/seq_prioq.c b/sound/core/seq/seq_prioq.c
    index 29896ab..9d73507 100644
    --- a/sound/core/seq/seq_prioq.c
    +++ b/sound/core/seq/seq_prioq.c
    @@ -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) {
    - snd_printd("oops: malloc failed for snd_seq_prioq_new()\n");
    + if (!f)
    return NULL;
    - }

    spin_lock_init(&f->lock);
    f->head = NULL;
    diff --git a/sound/core/seq/seq_queue.c b/sound/core/seq/seq_queue.c
    index 4c9aa46..77ec214 100644
    --- a/sound/core/seq/seq_queue.c
    +++ b/sound/core/seq/seq_queue.c
    @@ -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) {
    - snd_printd("malloc failed for snd_seq_queue_new()\n");
    + if (!q)
    return NULL;
    - }

    spin_lock_init(&q->owner_lock);
    spin_lock_init(&q->check_lock);
    diff --git a/sound/core/seq/seq_timer.c b/sound/core/seq/seq_timer.c
    index 6ec30a9..e16b197 100644
    --- a/sound/core/seq/seq_timer.c
    +++ b/sound/core/seq/seq_timer.c
    @@ -56,10 +56,8 @@ struct snd_seq_timer *snd_seq_timer_new(void)
    struct snd_seq_timer *tmr;

    tmr = kzalloc(sizeof(*tmr), GFP_KERNEL);
    - if (tmr == NULL) {
    - snd_printd("malloc failed for snd_seq_timer_new() \n");
    + if (!tmr)
    return NULL;
    - }
    spin_lock_init(&tmr->lock);

    /* reset setup to defaults */
    --
    2.7.0
    \
     
     \ /
      Last update: 2016-03-10 01:01    [W:5.010 / U:0.120 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site