From patchwork Thu Jan 11 18:02:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 859224 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zHYjH3bnxz9ryQ for ; Fri, 12 Jan 2018 05:06:27 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3zHYjH2Zw6zF0WC for ; Fri, 12 Jan 2018 05:06:27 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=users.sourceforge.net (client-ip=212.227.15.14; helo=mout.web.de; envelope-from=elfring@users.sourceforge.net; receiver=) Received: from mout.web.de (mout.web.de [212.227.15.14]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3zHYdP3wwVzF0h7 for ; Fri, 12 Jan 2018 05:03:04 +1100 (AEDT) Received: from [192.168.1.3] ([92.227.255.105]) by smtp.web.de (mrweb001 [213.165.67.108]) with ESMTPSA (Nemesis) id 0MXHt7-1eLAaR1XCH-00WIL8; Thu, 11 Jan 2018 19:02:46 +0100 Subject: [PATCH 3/5] powerpc/4xx: Delete an error message for a failed memory allocation in three functions From: SF Markus Elfring To: linuxppc-dev@lists.ozlabs.org, Benjamin Herrenschmidt , Michael Ellerman , Paul Mackerras , Rob Herring , Tyrel Datwyler References: <2b9b4285-f1c0-5dc7-35c6-df901c9ca0eb@users.sourceforge.net> Message-ID: <92f46132-b654-cc73-a589-4abf8ab3122a@users.sourceforge.net> Date: Thu, 11 Jan 2018 19:02:45 +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: <2b9b4285-f1c0-5dc7-35c6-df901c9ca0eb@users.sourceforge.net> Content-Language: en-GB X-Provags-ID: V03:K0:Z+iETydpHlZ79or2o7fPTG5QJ97DQJjVkkdrwbCuZxW1m7k2KcO DGHm6I0NQ3FYXXER7gqXSx5HwXkV610NtK6wcZW0OUeFLng8+xolg+BMUdG3KlEwBEKSX+i WHYG8F8Ch+9uXdEr9srqL1WwmPQW5N/jOWpYCbdvtC7C/Fmm7CD+ZTYVYy6rRBnR7WMX5qf snRUz+9UituvHDtU6jzPg== X-UI-Out-Filterresults: notjunk:1; V01:K0:xnis+3JOaL4=:5ZRT0cvPmlK8wZHZ+SlY76 uaO6qhQM7jvaEO0wEmRNbaukziAkpgUafyYXG/x8MbZ/XcvT3NoPfMwA92y30Ve/Ii72tl0dM /Ej6YPWii2HSX6akygcdwemXACZMg9kPydKs0MFPNIybflo6oY6eMEkgMO3DEMIFBqewcI6cV BmPhnTwZ52r8cxgsjauaUk0YZMnx59CdV90NJY/QbaD/HzikJDECTxH9Ry4Rh2WGqsqD/8BvZ 1dOmq/ApAn5GlQJp6ERozCeyF1YdKZrwu+5/ehXH/TQ6VXr12L+M4bkCFwAQ0FwIC+ZrR+vi4 vPIIsfdHb1JzHvMOOVD5HZ9kgntDjopTNYrJXF/ZuIB+khYuRQK84b+nS8uPHQG2HiddqBxF1 VvPLtgEQ+T8QTinBXaV9doL+t2/cM00yM4TMntFnvh5VyiL7QsIuePY6C7W/iRuAqvISHN5tN A0gXbQ8J6c6AzMkNC46NUXPk5xb3QTJAvMzxGxBgI0bseXd4rp0yY2UNmm885qgDBBRm5B3I0 TZl55i6Ab/jiRvdlAaeb7oJneD7d/S+CYeQlyHmXt7BIGyUBUffZzz+f0G9BL5SVrs0UauYN1 eDnOjGEAs8U5Yj5XUYXDxC2AWUppv+sloFzydHR/lfZu26cHAhkZJZ/WEmf9WqdvNZUiJpDDY xfcmowUxbJq9NNt5B1tw2wRZqiOmQ3caxjZ/rudquMSTPL/Qe4qru2epkD8aUKfPnwNGSG0TI P2qgjdrcFhZ1HZyZk3lfgJTF5j+kksWNzLcvu8ylp8LIeDhRE2msC+nbdly/RQ/6UqJc9KswO VVZS2MoHlULnIMW2OulUAXZ15iVTKPaFxp1JjRjJzxpczQ5tMA= X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.24 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kernel-janitors@vger.kernel.org, LKML Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" From: Markus Elfring Date: Thu, 11 Jan 2018 18:28:54 +0100 Omit an extra message for a memory allocation failure in these functions. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- arch/powerpc/platforms/4xx/msi.c | 5 ++--- arch/powerpc/platforms/4xx/ocm.c | 5 +---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/arch/powerpc/platforms/4xx/msi.c b/arch/powerpc/platforms/4xx/msi.c index d50417e23add..d16b81303cb0 100644 --- a/arch/powerpc/platforms/4xx/msi.c +++ b/arch/powerpc/platforms/4xx/msi.c @@ -224,10 +224,9 @@ static int ppc4xx_msi_probe(struct platform_device *dev) dev_dbg(&dev->dev, "PCIE-MSI: Setting up MSI support...\n"); msi = kzalloc(sizeof(struct ppc4xx_msi), GFP_KERNEL); - if (!msi) { - dev_err(&dev->dev, "No memory for MSI structure\n"); + if (!msi) return -ENOMEM; - } + dev->dev.platform_data = msi; /* Get MSI ranges */ diff --git a/arch/powerpc/platforms/4xx/ocm.c b/arch/powerpc/platforms/4xx/ocm.c index 8cb601e8bed7..5a750d0ad446 100644 --- a/arch/powerpc/platforms/4xx/ocm.c +++ b/arch/powerpc/platforms/4xx/ocm.c @@ -337,7 +337,6 @@ void *ppc4xx_ocm_alloc(phys_addr_t *phys, int size, int align, ocm_blk = kzalloc(sizeof(struct ocm_block), GFP_KERNEL); if (!ocm_blk) { - printk(KERN_ERR "PPC4XX OCM: could not allocate ocm block"); rh_free(ocm_reg->rh, offset); break; } @@ -391,10 +390,8 @@ static int __init ppc4xx_ocm_init(void) return 0; ocm_nodes = kzalloc((count * sizeof(struct ocm_info)), GFP_KERNEL); - if (!ocm_nodes) { - printk(KERN_ERR "PPC4XX OCM: failed to allocate OCM nodes!\n"); + if (!ocm_nodes) return -ENOMEM; - } ocm_count = count; count = 0;