Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751963AbdHGQGt (ORCPT ); Mon, 7 Aug 2017 12:06:49 -0400 Received: from mout.web.de ([212.227.15.14]:62777 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751426AbdHGQGr (ORCPT ); Mon, 7 Aug 2017 12:06:47 -0400 To: Jens Axboe , kernel-janitors@vger.kernel.org Cc: LKML From: SF Markus Elfring Subject: [PATCH] z2ram: Delete four error messages for a failed memory allocation in z2_open() Message-ID: <83b6c012-07ca-39df-cfd4-0c4791ecda3d@users.sourceforge.net> Date: Mon, 7 Aug 2017 18:06:41 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:sbLrrgC2qSqyZ1/gaJepPStg45RlYUpSXLVzYE/2lz6rpQKxJOR 7qYuH0M8K50FRPv/N1xUx2+flJcfi7Sof09ZiGZ3hfpUov2RgFpU6t90rQD+EMpJJc3zraV sMPq005weNlz/DAhOlvVYapu6N9JGSYpTK0zcMc14RN1esIY7cYwPVQxqpgbYDdQ8T0kHfV yPjFqy/gxK5MCaS1FujVw== X-UI-Out-Filterresults: notjunk:1;V01:K0:CzQHiwGy+0g=:ez92GqXxyw423hZEgDG/uC guXd9+eXcD2ktHDGxebUtaDOzhaOgji6nJG8/Byu1rGr/x5sQrq1lcVJw/N//lFY+CbJrn0Ye kT0euVAl54hFwTE+3uFqBZLeDx/zsejPdZSvEQQnGi3B/orBsyiK/oPRMsFie4KGHRrdq/0gi wTuGbiojwHSYYcwAlDIJuc3hjNeFAwp3DrEL79WVdwIex8t138RcLji+IggLRv/KQ53ql8yef QxfpB4JE26Odj5EtPDsSkifts4UsJjuyeb67w0kvZMHVUHEjhT1nyKxoaMHNTkqfZM/+RN3X/ AUusSMmeduq30xXVDr2NWTfQKUdp2zikBeI8Iwiz0bi1sqfe3iBW0FX4pU3Wfm2JB/zfbz2Kw mMFDNWZYghRjsjMLgvJfnIzeRUmdub74L60VtR9t1pah8msk/ZfjuJAvUVtQscFav7h1DDvbR 0Y2aFVALPqZySQJOoUtc+4LOtNGQmciFrmvNeSkzSS8YhkXh6aYFjGl2k++bVgjjCFcj4rQIY 6ZwFc2SXKEUSujXZE2n0iCQ1E/OcaUlfo1Uq+RNispjDHNDGIykL6CsKvEsiwcIAJPfgwGuQi V2r4W56pr+BWWyl8HpadvruGB84Xh7gNfVpgdRSNK1dpj9O/JC+BRFXt18CWBcmWB5pDb7jxF j3XTOGTqkN9N0JvQ7dR99NH8lXnF7cbx+5WVRpIb0kcUN5VMTUHCA85HBBwdyQMq7uj8xTT01 nYmZ7gXsk2ELbi/heUiLkcyecdDthQnQQNorUEQHqpSYPqERVtfujPQwnN0zwMrP3t6sdNqGG QlmHcsonNXnHqmZRs7JmGCDLCDgAyNLUGU1b+5o+PW852WdVDg= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2096 Lines: 75 From: Markus Elfring Date: Mon, 7 Aug 2017 17:56:53 +0200 Omit extra messages for a memory allocation failure in this function. This issue was detected by using the Coccinelle software. Link: http://events.linuxfoundation.org/sites/events/files/slides/LCJ16-Refactor_Strings-WSang_0.pdf Signed-off-by: Markus Elfring --- drivers/block/z2ram.c | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/drivers/block/z2ram.c b/drivers/block/z2ram.c index 41c95c9b2ab4..66af886cb0a0 100644 --- a/drivers/block/z2ram.c +++ b/drivers/block/z2ram.c @@ -199,12 +199,8 @@ static int z2_open(struct block_device *bdev, fmode_t mode) z2ram_map = kmalloc((size/Z2RAM_CHUNKSIZE)*sizeof(z2ram_map[0]), GFP_KERNEL); - if ( z2ram_map == NULL ) - { - printk( KERN_ERR DEVICE_NAME - ": cannot get mem for z2ram_map\n" ); + if (!z2ram_map) goto err_out; - } while (size) { z2ram_map[ z2ram_size++ ] = vaddr; @@ -224,12 +220,8 @@ static int z2_open(struct block_device *bdev, fmode_t mode) case Z2MINOR_COMBINED: z2ram_map = kmalloc( max_z2_map + max_chip_map, GFP_KERNEL ); - if ( z2ram_map == NULL ) - { - printk( KERN_ERR DEVICE_NAME - ": cannot get mem for z2ram_map\n" ); + if (!z2ram_map) goto err_out; - } get_z2ram(); get_chipram(); @@ -245,12 +237,8 @@ static int z2_open(struct block_device *bdev, fmode_t mode) case Z2MINOR_Z2ONLY: z2ram_map = kmalloc( max_z2_map, GFP_KERNEL ); - if ( z2ram_map == NULL ) - { - printk( KERN_ERR DEVICE_NAME - ": cannot get mem for z2ram_map\n" ); + if (!z2ram_map) goto err_out; - } get_z2ram(); @@ -263,12 +251,8 @@ static int z2_open(struct block_device *bdev, fmode_t mode) case Z2MINOR_CHIPONLY: z2ram_map = kmalloc( max_chip_map, GFP_KERNEL ); - if ( z2ram_map == NULL ) - { - printk( KERN_ERR DEVICE_NAME - ": cannot get mem for z2ram_map\n" ); + if (!z2ram_map) goto err_out; - } get_chipram(); -- 2.13.4