From patchwork Thu Oct 5 19:36:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 822033 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3y7NQD0YnBz9t48 for ; Fri, 6 Oct 2017 06:39:48 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3y7NQC6WsGzDrMY for ; Fri, 6 Oct 2017 06:39:47 +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.17.12; helo=mout.web.de; envelope-from=elfring@users.sourceforge.net; receiver=) Received: from mout.web.de (mout.web.de [212.227.17.12]) (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 3y7NLl4hz3zDrLB for ; Fri, 6 Oct 2017 06:36:47 +1100 (AEDT) Received: from [192.168.1.2] ([77.181.51.69]) by smtp.web.de (mrweb101 [213.165.67.124]) with ESMTPSA (Nemesis) id 0MA5if-1eBUTF4BXV-00BLQA; Thu, 05 Oct 2017 21:36:29 +0200 Subject: [PATCH 1/2] powerpc/platforms/cell: Delete an error message for a failed memory allocation in three functions From: SF Markus Elfring To: linuxppc-dev@lists.ozlabs.org, Arnd Bergmann , Benjamin Herrenschmidt , Jeremy Kerr , Michael Ellerman , Paul Mackerras References: Message-ID: <62146108-5be0-c236-f404-4be122e162ac@users.sourceforge.net> Date: Thu, 5 Oct 2017 21:36:26 +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: Content-Language: en-GB X-Provags-ID: V03:K0:s6XbvOd0ExoAXA/3jMqKJptu+fZiWu8xsJ2EX3ZV10AveVnWNXu oqKNcyHDryoXybXwXkZ0NZzHC8e1RONv5xUZ5/H5m3TqPDiLeDPUnbYmUsPlkbqVk1LfUsc 2vUpwMJUXDd7N1pgKs9iqyZQkKW8JmDgLXB73RMORPKAPpCB4lDebErN9kSeE7vFY9LfztO Mv27rYntTxmnd40eFwmlQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:Wa/Bg4JPhgg=:v5eYTp0PtwEuT5Q9csUBK/ DzC6rAsQKge9c2ML63DJF+tXjtjBR+FB6FBZUucXUWA/r50S+CH+PLqM9vZ9sf3IqX13cOl1C 8WoU5vtKgVdxw2EkC8CuDpdqWs7yg5e/Smxjm4S8oMFv4nSb/4fg1t+2jvroeKQxlen8MXiZj QzQvKizvjz4CnWARV6Byf23b8AqFOkqyGWPDHm8MIgWbLMNC5dFlcQ7Oq7cSkYkJljwODYZ79 4wTQsfoqtpqFjxNMFwtUGguPiupk+ykmk9yZSc2eTpIEhVekGP0rWTVtjCgm++LLrDWwgGUPY q0NgQgQmCw4jU6RCzyXSTY3tOn/n2GXe4xTvjY1PD1eUczkS3cZIieklFsuMP8KE2k7Zgv3GG E93K3o+m4blXzzxHlf9pFVvlv370ffZ1CTgE6K7dyrpDgz7TniifRi21IUlDjyoJeYLYwUyH2 qtK2BWPPciZWYrKv2+Q3yuvwjmk7UICjykFUzx7zzQCD7OtQyvn6xCDtLKYWPIxYL2RLbIG4v Bd4ID+6PJodaXXSpMcZ2A+xngnfvQSk+MboOrHvfqtU6qI4B7wmr/eReqXBY+hShhYMnRnEhY EdwGru2NqhF6VLk1ob4yeBeVLbBfWzAjVmxQCz+WihYPi+KizuIaIGkdfhc0v6+JGTWSQNk6a l+cZhnj0jDlvhGpWwgp8nfdhLG+b+KMxCCCB5kLa09aZtAyTpjJfuKzGFN27Sxc4jteli5civ xeZfqgKnPZllN8Q2RCjgPdh+pgxVJctRWun3H3kjkOO+R6ncO2VttofIAIkskZLhtSPVmzLs6 ++TUahpf9sfeHU3f/DA/0gUJxEKKho42BkrkZVUTnYFbpxRTz0= 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, 5 Oct 2017 21:04:30 +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 --- arch/powerpc/platforms/cell/axon_msi.c | 5 +---- arch/powerpc/platforms/cell/spider-pci.c | 9 ++------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/arch/powerpc/platforms/cell/axon_msi.c b/arch/powerpc/platforms/cell/axon_msi.c index 6ea3f248b155..513d13d779b3 100644 --- a/arch/powerpc/platforms/cell/axon_msi.c +++ b/arch/powerpc/platforms/cell/axon_msi.c @@ -343,11 +343,8 @@ static int axon_msi_probe(struct platform_device *device) pr_devel("axon_msi: setting up dn %pOF\n", dn); msic = kzalloc(sizeof(struct axon_msic), GFP_KERNEL); - if (!msic) { - printk(KERN_ERR "axon_msi: couldn't allocate msic for %pOF\n", - dn); + if (!msic) goto out; - } dcr_base = dcr_resource_start(dn, 0); dcr_len = dcr_resource_len(dn, 0); diff --git a/arch/powerpc/platforms/cell/spider-pci.c b/arch/powerpc/platforms/cell/spider-pci.c index d1e61e273e64..0a9f00563144 100644 --- a/arch/powerpc/platforms/cell/spider-pci.c +++ b/arch/powerpc/platforms/cell/spider-pci.c @@ -104,10 +104,8 @@ static int __init spiderpci_pci_setup_chip(struct pci_controller *phb, * Celleb does not have this problem, because it has only one XDR. */ dummy_page_va = kmalloc(PAGE_SIZE, GFP_KERNEL); - if (!dummy_page_va) { - pr_err("SPIDERPCI-IOWA:Alloc dummy_page_va failed.\n"); + if (!dummy_page_va) return -1; - } dummy_page_da = dma_map_single(phb->parent, dummy_page_va, PAGE_SIZE, DMA_FROM_DEVICE); @@ -134,11 +132,8 @@ int __init spiderpci_iowa_init(struct iowa_bus *bus, void *data) np); priv = kzalloc(sizeof(struct spiderpci_iowa_private), GFP_KERNEL); - if (!priv) { - pr_err("SPIDERPCI-IOWA:" - "Can't allocate struct spiderpci_iowa_private"); + if (!priv) return -1; - } if (of_address_to_resource(np, 0, &r)) { pr_err("SPIDERPCI-IOWA:Can't get resource.\n");