From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751234AbdIOHtD (ORCPT ); Fri, 15 Sep 2017 03:49:03 -0400 Received: from mout.web.de ([212.227.17.11]:52043 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750865AbdIOHtB (ORCPT ); Fri, 15 Sep 2017 03:49:01 -0400 Subject: [PATCH 1/9] [media] tm6000: Delete seven error messages for a failed memory allocation From: SF Markus Elfring To: linux-media@vger.kernel.org, Andi Shyti , Andrew Morton , Arvind Yadav , Bhumika Goyal , Christophe Jaillet , =?UTF-8?Q?David_H=c3=a4rdeman?= , Hans Verkuil , Laurent Pinchart , Masahiro Yamada , Mauro Carvalho Chehab , Sakari Ailus , Santosh Kumar Singh , Sean Young , Wei Yongjun Cc: LKML , kernel-janitors@vger.kernel.org References: <2aade468-5dfd-76ee-f59f-c25864930f61@users.sourceforge.net> Message-ID: <00911f7a-7533-1da3-24d4-e3ab7d7a8104@users.sourceforge.net> Date: Fri, 15 Sep 2017 09:48:18 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 In-Reply-To: <2aade468-5dfd-76ee-f59f-c25864930f61@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:K7cGDDIL6K1uYeYAu1tBWyJj/YKambU8dAJ4fsGL58oy7kDKi4v YZMQTsCCFHeM5MuCvCGvdyhl8Vn3bXRu5KuXz2TRzKOxdSNj/hyra2SsmfV7nc0BZdq6N75 eknczYY94kq7Vt+kprdZMrI2ksY82m6kR/P/Y9/2BdbD7W995sWznstGR1i7wMOeSGgVisS cwrP45gLs+Q+iVQmLlJHw== X-UI-Out-Filterresults: notjunk:1;V01:K0:cZZ3FsKaC/s=:5il8atn4PIglF7yMYQb9VG CjZaT+UQHi2kJ6cM/6IyHsJhfcrlyMoFdYEl+pHYOX2hIQwBZl9DNEFtEGnqfdUgQ6WR8mZ9T qj76vHkb5xQoROxB9mWgwzygVDRWGDKpV8mW09gfHG+VmPl+veDycSlzzevUBr7XhXrxc7oiR +aeEiP26AZ+PrJNs0hInaIx/EvyxSGuHlCbGNiCbZG4XZVfOzRUK01zpvDjAblC1rG4L/vlsp rYw4ajPcRVmVPuMo+lFgt/IORDSmSKrnsgTVpNcOwBy4tPSqkFRQlECpI+2dL0fPsAJwtTWrK klSfRB9C2Q1WuG0uvj3qm5MVAr0C5XTwFjaZqEU/fTu8GEHfQLG1I5S95Ha0NGN1c84lBhjIi fHOpYlvQ43Aw29AiM0PykHyRmG8QNWdlzDmwcM8RIRKFfNQ9r1USEVMN5mg0JOZN5lfSz8XOV uj74UC9NWILOC5z2kdgci/HZQdDxMody4dyCO+v54yZ28K1ezhc+PH4In/Xa88+FWS6pBYMla SsVnKm2CscBa06tSJ2hKKUwv/uENHYMxE9WFTMAvjTG4/T3Exxb4pipGaiyxzOsUHuRk1nBuT bb6Zy6UApRI3ssxRx2JHnksZbYapg9EC2KTRRlbY0HbdBbKYR3on/wRUa9u/GQwDHMLU9uOmB 5JRWzmTl913UMj5FNVxAfZ3JRl+UleqgzpKbRzh/YQm98bA1H6P4bYdeKYT8inF6eR5qIs971 kPSKspr8Nvwz8R3VUFf197vuwTts724zg5mrdHJ6gwTRNeexJPDlazY03f69ocfDVynvyURls StNC8K4mV64FFN9nRIS1eeBSynLQOFaYF4eIRgv9BxjuG56+aA= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Thu, 14 Sep 2017 14:34:39 +0200 Omit extra messages for a memory allocation failure in these functions. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/media/usb/tm6000/tm6000-cards.c | 1 - drivers/media/usb/tm6000/tm6000-dvb.c | 5 +---- drivers/media/usb/tm6000/tm6000-video.c | 13 +++---------- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/drivers/media/usb/tm6000/tm6000-cards.c b/drivers/media/usb/tm6000/tm6000-cards.c index 2537643a1808..817bae8cb6a1 100644 --- a/drivers/media/usb/tm6000/tm6000-cards.c +++ b/drivers/media/usb/tm6000/tm6000-cards.c @@ -1210,4 +1210,3 @@ static int tm6000_usb_probe(struct usb_interface *interface, - printk(KERN_ERR "tm6000" ": out of memory!\n"); usb_put_dev(usbdev); return -ENOMEM; } diff --git a/drivers/media/usb/tm6000/tm6000-dvb.c b/drivers/media/usb/tm6000/tm6000-dvb.c index 097ac321b7e1..61a4e0a52716 100644 --- a/drivers/media/usb/tm6000/tm6000-dvb.c +++ b/drivers/media/usb/tm6000/tm6000-dvb.c @@ -137,5 +137,4 @@ static int tm6000_start_stream(struct tm6000_core *dev) usb_free_urb(dvb->bulk_urb); - printk(KERN_ERR "tm6000: couldn't allocate transfer buffer!\n"); return -ENOMEM; } @@ -403,7 +402,5 @@ static int dvb_init(struct tm6000_core *dev) - if (!dvb) { - printk(KERN_INFO "Cannot allocate memory\n"); + if (!dvb) return -ENOMEM; - } dev->dvb = dvb; diff --git a/drivers/media/usb/tm6000/tm6000-video.c b/drivers/media/usb/tm6000/tm6000-video.c index ec8c4d2534dc..701494e72edc 100644 --- a/drivers/media/usb/tm6000/tm6000-video.c +++ b/drivers/media/usb/tm6000/tm6000-video.c @@ -477,13 +477,9 @@ static int tm6000_alloc_urb_buffers(struct tm6000_core *dev) - if (!dev->urb_buffer) { - tm6000_err("cannot allocate memory for urb buffers\n"); + if (!dev->urb_buffer) return -ENOMEM; - } dev->urb_dma = kmalloc(sizeof(dma_addr_t *)*num_bufs, GFP_KERNEL); - if (!dev->urb_dma) { - tm6000_err("cannot allocate memory for urb dma pointers\n"); + if (!dev->urb_dma) return -ENOMEM; - } for (i = 0; i < num_bufs; i++) { dev->urb_buffer[i] = usb_alloc_coherent( @@ -601,12 +597,9 @@ static int tm6000_prepare_isoc(struct tm6000_core *dev) - if (!dev->isoc_ctl.urb) { - tm6000_err("cannot alloc memory for usb buffers\n"); + if (!dev->isoc_ctl.urb) return -ENOMEM; - } dev->isoc_ctl.transfer_buffer = kmalloc(sizeof(void *)*num_bufs, GFP_KERNEL); if (!dev->isoc_ctl.transfer_buffer) { - tm6000_err("cannot allocate memory for usbtransfer\n"); kfree(dev->isoc_ctl.urb); return -ENOMEM; } -- 2.14.1