From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753201AbdEPNgo (ORCPT ); Tue, 16 May 2017 09:36:44 -0400 Received: from mout.web.de ([212.227.17.12]:55670 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753070AbdEPNgl (ORCPT ); Tue, 16 May 2017 09:36:41 -0400 To: linux-s390@vger.kernel.org, Heiko Carstens , =?UTF-8?Q?Jan_H=c3=b6ppner?= , Martin Schwidefsky , Stefan Haberland Cc: LKML , kernel-janitors@vger.kernel.org, Wolfram Sang From: SF Markus Elfring Subject: [PATCH] S390-DASD: Delete an error message for a failed memory allocation in two functions Message-ID: <5708cda3-991c-e05c-85c4-5b2199395bb4@users.sourceforge.net> Date: Tue, 16 May 2017 15:36:34 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.1.1 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:bG13CdZyctFxPcsmMBeJ/poXtYaJnNSPgxqnAHsgx5hZ9hYP7ix gr7ijmi5cbHVuu9QPo1Cq+aJbsxMqSHD5wa82cSFiUT6tXLR2oBn82x20D0QnO1zcXcE+tq xKtZWjjqQC3TaZbfwFvnUa8/4HXqdgtOLtASeFuShtq1lJ2VBauzuU8jpKZFh5DhteBQUl8 CaEwZRlWBw+E49s4SpHvA== X-UI-Out-Filterresults: notjunk:1;V01:K0:K1ZtYJT3/Pg=:scgM2mdDD29Fh0yTHnMERX k73i888FJDETyOcSYIW9gdPM1H/nzIN3HjIGCmHtPugBZ3uxN+n5mvnyjSyrbsSHPsBF1VE3m s26OLpoSQD4K0MMHTb6UzL0y5R4ongMX7sWPkxt6s55d8IO+ZScY3jJUqYf8It0tF8QHm1GQx UQMOTLLinaFqycUJUHLnkAtSY3eOFSMRA2X8k1d/suArRHQ8M9KIQ9E/wJ2GRlZlKD6pd9OV3 5tvl2R3wxivWSd6RiwHXXsgUUBum7b2HWJjQ/cDyvwCkbN7O2c2+EPM5gzseDOU+4fG+hglCe FIowHs3rG1iKLorlFq3o9K97UEXj07I+AhOkDLQFmjtWcMDk8dPXMK3PgwjvKnBw9K3HQwbFi Ha+U46WHuuUL9Ts9aZ/wgTeg4BGNTPAoGhLvqbYf6suaWK3/pKzAovUNz8BQOPcXQRUgFEEwO SQzlhLQVKFA2xCN/3kvw6lVZoXdLMTP93WbL+CewHCF1Iw2osmHsF/pc+Gjwp9z6Plo7OCqQA jAhM60dfjH2dIdEmhmYho5m2r9a4LvONoU9tDCrF8VTl8m8k96bFZy+2Sh0394fEMGKBQx9Tc XnfxVSheTqxR/Q/CvvhQymyBPG8jqhW+3KAp0cF07yyaiKeu2NB48VHUts5pDW/ONN7YiADXp jEXJP2p3/u2YT65JZUEUtSZJJkbBhKeb7mV3DM96HmycvRaP773Ty3e2WzyCIJvj5Y5SdkUJ8 lVJqYfGLw/m1tb+eVLWlk8/INdxws0f1cN4tbP3yANlYuYpy2WlZ6X6rH9JybGOfXHIK1vFs8 Kiazqwx Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Tue, 16 May 2017 15:30:44 +0200 Omit an extra message 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/s390/block/dasd_eckd.c | 7 ++----- drivers/s390/block/dasd_fba.c | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c index 122456e4db89..99c73decae49 100644 --- a/drivers/s390/block/dasd_eckd.c +++ b/drivers/s390/block/dasd_eckd.c @@ -1721,12 +1721,9 @@ dasd_eckd_check_characteristics(struct dasd_device *device) } if (!private) { private = kzalloc(sizeof(*private), GFP_KERNEL | GFP_DMA); - if (!private) { - dev_warn(&device->cdev->dev, - "Allocating memory for private DASD data " - "failed\n"); + if (!private) return -ENOMEM; - } + device->private = private; } else { memset(private, 0, sizeof(*private)); diff --git a/drivers/s390/block/dasd_fba.c b/drivers/s390/block/dasd_fba.c index 462cab5d4302..2b2f9b0da5c2 100644 --- a/drivers/s390/block/dasd_fba.c +++ b/drivers/s390/block/dasd_fba.c @@ -132,12 +132,9 @@ dasd_fba_check_characteristics(struct dasd_device *device) if (!private) { private = kzalloc(sizeof(*private), GFP_KERNEL | GFP_DMA); - if (!private) { - dev_warn(&device->cdev->dev, - "Allocating memory for private DASD " - "data failed\n"); + if (!private) return -ENOMEM; - } + device->private = private; } else { memset(private, 0, sizeof(*private)); -- 2.13.0