Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933780AbeAJOEr (ORCPT + 1 other); Wed, 10 Jan 2018 09:04:47 -0500 Received: from mout.web.de ([212.227.17.11]:53189 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752953AbeAJOEp (ORCPT ); Wed, 10 Jan 2018 09:04:45 -0500 Subject: [PATCH 1/3] sgi-xpc: Delete error messages for a failed memory allocation in three functions From: SF Markus Elfring To: kernel-janitors@vger.kernel.org, Arnd Bergmann , Greg Kroah-Hartman , Robin Holt Cc: LKML References: Message-ID: Date: Wed, 10 Jan 2018 15:04:41 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.2 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:xB/Gf3sUHYsACTaKQKuJlYsv5q5wdD0ITUrTGPRa1yFUpP9zPQl Yq/hW86Ee+gMlejKPMmlvM2WSn1OljiLPHuluicdPnKcWGT9LgA1GMHAXaplT6joW3ghnEK MWpOM8kxdIrV9XwbwWIT5VigiuE7zpOrZCDY+6jl9jyn7i9RtA2lV+I5m0+zC1oC0yrpjHC MvK02FKDuF8bmvGRb685Q== X-UI-Out-Filterresults: notjunk:1;V01:K0:CAMEZtDSSxE=:FibBaO/7+RgtQrAmyMOhbN IwJf0zympG7PPNaZvOneuFjvrhJ7F/QQuB5ZhHgz+nIycqKR0jnFRCZSMi4uU54Ig/l87pZO6 I2swU+0dsnbAsUQ63RQ10LJfxwdE3wP3kLwXzgGz8AV2jxl0EkJeiXg2/7gHVHjaE+FS3f704 b4dvvCQRN98biKgY1FC0gOEmt/ZeClu9oTRH7PYTR4PUXPgqkU16s8iuZ56vhKEeNE2JZnlMJ /X8HH3O+egsIX3uMAw5NaimATsYDpVBbegwFjWqgRtl1DTYm8P3iF6Nua1O4VVFmsho/uGUHK 3WO9buWSfDwcwaIKGWoIywQkneh+cFPdjjnRwc5UxLvRd5WoWQJrw9YNw6o8IEBG2MJGdmd2F WfQdHMFSA5Ra3DITUbeGzl25UFg8qmvRv2LX8khKKrMLECVq8ST09Q4il1RhvgCxeDeRl76EW +djjFFvOGC2M0NtG5sQpOD9Of2V+LdRuXCLaz3MPlJtPA453nsUbyNRHEC5KnKBLFqCyY4cwy R3qGZZuE2ZfNGDyC+gGQmxyoiCOYw/fI92qTbLH2x94l8R1ldperFZ+tIfvI003M6shlzGium vgegh3svBH9LtGqFm+EQb9xKj54j7YobDc6ntUMCzUwHGJA8yjsnEuP7uVkrF/y82/v/osTOK BC/xIEknPaNheILj2W3glAGW7ey86hnj2RSH3QJqf5TfeAiVvdPlBBA2DM0/qC27mdJJw1JXe yAVbCIdh+b1JNb4bs+1VdZVWWX8TMHjX3fRlOuHUjG3XgF8V3g01vjAzIO3v8KIoWwF2ReIvf yhzLD6wK3B8Fm7pPkgOdChOM9G4bHZp6dd0n6qBqB2Q6AR79pI= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: From: Markus Elfring Date: Wed, 10 Jan 2018 14:00:17 +0100 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/misc/sgi-xp/xpc_main.c | 8 ++------ drivers/misc/sgi-xp/xpc_uv.c | 4 ---- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c index 0c775d6fcf59..c90a9ff30680 100644 --- a/drivers/misc/sgi-xp/xpc_main.c +++ b/drivers/misc/sgi-xp/xpc_main.c @@ -418,10 +418,8 @@ xpc_setup_ch_structures(struct xpc_partition *part) DBUG_ON(part->channels != NULL); part->channels = kzalloc(sizeof(struct xpc_channel) * XPC_MAX_NCHANNELS, GFP_KERNEL); - if (part->channels == NULL) { - dev_err(xpc_chan, "can't get memory for channels\n"); + if (!part->channels) return xpNoMemory; - } /* allocate the remote open and close args */ @@ -907,10 +905,8 @@ xpc_setup_partitions(void) xpc_partitions = kzalloc(sizeof(struct xpc_partition) * xp_max_npartitions, GFP_KERNEL); - if (xpc_partitions == NULL) { - dev_err(xpc_part, "can't get memory for partition structure\n"); + if (!xpc_partitions) return -ENOMEM; - } /* * The first few fields of each entry of xpc_partitions[] need to diff --git a/drivers/misc/sgi-xp/xpc_uv.c b/drivers/misc/sgi-xp/xpc_uv.c index 340b44d9e8cf..0c95f9994649 100644 --- a/drivers/misc/sgi-xp/xpc_uv.c +++ b/drivers/misc/sgi-xp/xpc_uv.c @@ -217,8 +217,6 @@ xpc_create_gru_mq_uv(unsigned int mq_size, int cpu, char *irq_name, mq = kmalloc(sizeof(struct xpc_gru_mq_uv), GFP_KERNEL); if (mq == NULL) { - dev_err(xpc_part, "xpc_create_gru_mq_uv() failed to kmalloc() " - "a xpc_gru_mq_uv structure\n"); ret = -ENOMEM; goto out_0; } @@ -226,8 +224,6 @@ xpc_create_gru_mq_uv(unsigned int mq_size, int cpu, char *irq_name, mq->gru_mq_desc = kzalloc(sizeof(struct gru_message_queue_desc), GFP_KERNEL); if (mq->gru_mq_desc == NULL) { - dev_err(xpc_part, "xpc_create_gru_mq_uv() failed to kmalloc() " - "a gru_message_queue_desc structure\n"); ret = -ENOMEM; goto out_1; } -- 2.15.1