From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751314AbdL2O4P (ORCPT ); Fri, 29 Dec 2017 09:56:15 -0500 Received: from mout.web.de ([212.227.15.3]:64730 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751070AbdL2O4N (ORCPT ); Fri, 29 Dec 2017 09:56:13 -0500 To: linux-pci@vger.kernel.org, Arvind Yadav , Benjamin Herrenschmidt , Bjorn Helgaas , Kees Cook , Keith Busch , Michael Ellerman , Mika Westerberg , Paul Mackerras , linuxppc-dev@lists.ozlabs.org From: SF Markus Elfring Subject: [PATCH] pci/hotplug: Delete error messages for a failed memory allocation in four functions Cc: LKML , kernel-janitors@vger.kernel.org Message-ID: Date: Fri, 29 Dec 2017 15:55:52 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.2 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:3LBV9DlpggwQaTIg5U/Xt48JWyDPsv2YGGDFfEnu2rd96KjlcYu 1O+CfVzCAbWJN5L1LEfnCdGXlyAK//t4PFxcfG55ObqSCoi6K3JrYU5LXigVtAQuYLrrD7e U0qzuO0+IHUygkLIeObdtJ+9szotXjqsbe8rrN7R3LrNSIZRiZPGOl33gSocOmlfm21zKfh jk1ErCy4MpQeSKZwv2/5A== X-UI-Out-Filterresults: notjunk:1;V01:K0:K4D1/RgulBs=:kOfXBdznear+ZcequpmzAq CM4XogQIH/fkddvlC+ipiNlCBB3nIQRb3NSg+1c3+fF5h89Oc2Ii9DxLCho1IoqLPLwrFne1v t57+fVuByDgu5+e+2jBef9CMB27U8rwqxwKPP7RtsrlvvBa3wK4kct+QpjcNRNpG2LUbReCxH ZglK1b0Km41YvM5CALCHN49uODaVvgfeONXvW7BPpT5qLw4/Ajn6NfQlFiDBClveCDlhgE7kU UI67+l35elpkcf5ll4FL6Mj17DdH0bt18eSxqLU+BllEAxhPDXUeHNa5RCy6m6d25Oe9/7HXL yLk75lfnYMPanxlSsPRgP8div7eqO4EBS07HfFAwGPr2QkCtHu25atOnn2vPvu04L16aj/a72 shsl9p2Cf9FPT9gdlpnF3T/iSdYeTNSOFT5VnWrOWmIAY8vyDb2vCYlTpQZsoO1w5BGw6VvRJ 3Hl+K1a3q2WkN1Wa2Z+6EOsgtqTr72I3VCuklamCzTxGpWrBmw9chTTQY9WuNVhsd3OKLDwEZ TgvsSCHfHkYe1MTWpGq+CTyPpq6AYUbcfDLfJ7igJtwsh+6oB7OVcz9khKXkGAZP5FcZpMpf5 92944PVJQ5Hg2HYcByrWGwoQplfXerXaEmEbJC4R6jvPgaPd4lcBjFJzHlsuZsLAMqxBvjgSi Y0QTQ/9aQShBQkBMbrq8W+3DUblnm5RHIM/2aHqzBUYvbAO20TzPFVrgL87sZ/gtv5TSRUaUf hQPWa4L/j63+pXESmbE5f7cs5pdmNk+RbASpOMiItYDiiszaCddce47VpFYwvaNx11iyPropr KM6M/wKAC6clXNUpZQWLqcbbebu2jVZ/tUd7jqbN7HXwUfLmQ4= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Fri, 29 Dec 2017 15:47:00 +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/pci/hotplug/pciehp_hpc.c | 5 ++--- drivers/pci/hotplug/pnv_php.c | 8 +------- drivers/pci/hotplug/shpchp_core.c | 5 ++--- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c index 7bab0606f1a9..ed27635ec740 100644 --- a/drivers/pci/hotplug/pciehp_hpc.c +++ b/drivers/pci/hotplug/pciehp_hpc.c @@ -838,10 +838,9 @@ struct controller *pcie_init(struct pcie_device *dev) struct pci_dev *pdev = dev->port; ctrl = kzalloc(sizeof(*ctrl), GFP_KERNEL); - if (!ctrl) { - dev_err(&dev->device, "%s: Out of memory\n", __func__); + if (!ctrl) goto abort; - } + ctrl->pcie = dev; pcie_capability_read_dword(pdev, PCI_EXP_SLTCAP, &slot_cap); diff --git a/drivers/pci/hotplug/pnv_php.c b/drivers/pci/hotplug/pnv_php.c index 74f6a17e4614..4ab318a0800d 100644 --- a/drivers/pci/hotplug/pnv_php.c +++ b/drivers/pci/hotplug/pnv_php.c @@ -266,7 +266,6 @@ static int pnv_php_add_devtree(struct pnv_php_slot *php_slot) fdt1 = kzalloc(0x10000, GFP_KERNEL); if (!fdt1) { ret = -ENOMEM; - dev_warn(&php_slot->pdev->dev, "Cannot alloc FDT blob\n"); goto out; } @@ -280,8 +279,6 @@ static int pnv_php_add_devtree(struct pnv_php_slot *php_slot) fdt = kzalloc(fdt_totalsize(fdt1), GFP_KERNEL); if (!fdt) { ret = -ENOMEM; - dev_warn(&php_slot->pdev->dev, "Cannot %d bytes memory\n", - fdt_totalsize(fdt1)); goto free_fdt1; } @@ -756,11 +753,8 @@ static irqreturn_t pnv_php_interrupt(int irq, void *data) * fine as the PCI devices (PE) aren't functional any more. */ event = kzalloc(sizeof(*event), GFP_ATOMIC); - if (!event) { - dev_warn(&pdev->dev, "PCI slot [%s] missed hotplug event 0x%04x\n", - php_slot->name, sts); + if (!event) return IRQ_HANDLED; - } dev_info(&pdev->dev, "PCI slot [%s] %s (IRQ: %d)\n", php_slot->name, added ? "added" : "removed", irq); diff --git a/drivers/pci/hotplug/shpchp_core.c b/drivers/pci/hotplug/shpchp_core.c index 7bfb87bd2b7e..2f2b87acf179 100644 --- a/drivers/pci/hotplug/shpchp_core.c +++ b/drivers/pci/hotplug/shpchp_core.c @@ -305,10 +305,9 @@ static int shpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent) return -ENODEV; ctrl = kzalloc(sizeof(*ctrl), GFP_KERNEL); - if (!ctrl) { - dev_err(&pdev->dev, "%s: Out of memory\n", __func__); + if (!ctrl) goto err_out_none; - } + INIT_LIST_HEAD(&ctrl->slot_list); rc = shpc_init(ctrl, pdev); -- 2.15.1