From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751415AbdHFTSF (ORCPT ); Sun, 6 Aug 2017 15:18:05 -0400 Received: from mout.web.de ([217.72.192.78]:59442 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751326AbdHFTSE (ORCPT ); Sun, 6 Aug 2017 15:18:04 -0400 Subject: [PATCH 1/5] mtip32xx: Delete an error message for a failed memory allocation in five functions From: SF Markus Elfring To: Bart Van Assche , Jens Axboe , Johannes Thumshirn , Ming Lei , Sagi Grimberg Cc: LKML , kernel-janitors@vger.kernel.org References: <524db5d1-1411-a839-6461-7c33403c1843@users.sourceforge.net> Message-ID: <53e47438-4ac6-4b1b-f478-0e361692c563@users.sourceforge.net> Date: Sun, 6 Aug 2017 21:17:36 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: <524db5d1-1411-a839-6461-7c33403c1843@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:S7xlRS1rlCvMGUErHHM/1alGpIYA76R8ep75Qb4A6XVpm+T9d8E GI86VJQ/FV0bJqnruIsXi3Xvqoud4/NeL4XtEZ45Ti7NjSRwEOM3wSK+kH5JrX4NGaXzBeT YPnYElj+vnjfljF+eEk4th5SmnGSFyC6migPCq85KSGT+C9DprfhMPMhpPh7oL9+YLBkzlv u0KNRvpgbp+LeOP9qSueQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:AqelsfuYtfM=:ZG8LqzokY3JaLdvXKDq7Wr hs7x/wklb2RNERh+4HKCb8rWGGMTBhiwA41o2Ou7j1yJuGFEmH4sVpPrm5K9in7Bs4IjcvfsH cv4zI0EVtiqG83HNH47NOK/yjyfdMTvZr45BZImZmacBVkImd1YigTjxm/bKllKhOfrMDLKsM mSwpipsQye3oyOB1JsX8BTFB5f1oGmyoA3wBi9dJ6Lo8XeaEfQOLvO/QAsCYpTNBW7foG19x2 /DppZdyRlH/gU/DQgPL/5KUHL+kekpbTHapiVHu5R32PYKr96JjnwcvARXZvnvkX2nVbr6WUC dOtYvmwgj+AM2XiWZOOeMc00SHVvwY29esIob/8KSiPQE0X+GAbewg0eHLd3QV3QbEnPPFJ3q HwBG1xaB9q78k7wTtiA6xAIUeIE5lIuejwy81LE+xRo1VzGOQ6tBIIUm60cUJNH/veEJx04ts w1pG++c/qcsxlL96Nm7tr0033Q0zhRcpw/dVnIAfnO6IjlYh3NbqaykeMWQtNJtkAvcvYhOFv JMasE2Wge2BrHtrgxA8JHmVi6iBUmmmk4TvmwS1KMnyfInIzKuwYRhYiiqpcyUInqCZpzhJtK r7Xnxbiy4LafkDlIx07ST8I2TKgL0WRFczvmQcvukiXsJD925Tp7cDqUuCzlgwS+T6wqYs8Ii 2VqxL0yWn8CRl6xKUnI0GVKJRdkgpqedA+HFOcy708DdDUUN8/gv4qmiv/qyoUB0D3iGuL/4t f/yaCi3TdlsntxnJnZHs/RZaW+7ghKx39vxLExHA25XtdBy1JL2hIedWPAd88geJQQWPV8zmh 2gnHMw5wngu6XcdludnvsiayqCw3aq6EqR5VM0ewKHl83/0Sp8= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sun, 6 Aug 2017 19:09:04 +0200 Omit an extra message for a memory allocation failure in these functions. 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/block/mtip32xx/mtip32xx.c | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c index 4a3cfc7940de..5ccbab619e57 100644 --- a/drivers/block/mtip32xx/mtip32xx.c +++ b/drivers/block/mtip32xx/mtip32xx.c @@ -2379,11 +2379,8 @@ static ssize_t mtip_hw_read_device_status(struct file *f, char __user *ubuf, return 0; buf = kzalloc(MTIP_DFS_MAX_BUF_SIZE, GFP_KERNEL); - if (!buf) { - dev_err(&dd->pdev->dev, - "Memory allocation: status buffer\n"); + if (!buf) return -ENOMEM; - } size += show_device_status(NULL, buf); @@ -2409,11 +2406,8 @@ static ssize_t mtip_hw_read_registers(struct file *f, char __user *ubuf, return 0; buf = kzalloc(MTIP_DFS_MAX_BUF_SIZE, GFP_KERNEL); - if (!buf) { - dev_err(&dd->pdev->dev, - "Memory allocation: register buffer\n"); + if (!buf) return -ENOMEM; - } size += sprintf(&buf[size], "H/ S ACTive : [ 0x"); @@ -2475,11 +2469,8 @@ static ssize_t mtip_hw_read_flags(struct file *f, char __user *ubuf, return 0; buf = kzalloc(MTIP_DFS_MAX_BUF_SIZE, GFP_KERNEL); - if (!buf) { - dev_err(&dd->pdev->dev, - "Memory allocation: flag buffer\n"); + if (!buf) return -ENOMEM; - } size += sprintf(&buf[size], "Flag-port : [ %08lX ]\n", dd->port->flags); @@ -3031,11 +3022,8 @@ static int mtip_hw_init(struct driver_data *dd) dd->port = kzalloc_node(sizeof(struct mtip_port), GFP_KERNEL, dd->numa_node); - if (!dd->port) { - dev_err(&dd->pdev->dev, - "Memory allocation: port structure\n"); + if (!dd->port) return -ENOMEM; - } /* Continue workqueue setup */ for (i = 0; i < MTIP_MAX_SLOT_GROUPS; i++) @@ -4228,11 +4216,8 @@ static int mtip_pci_probe(struct pci_dev *pdev, cpu_to_node(raw_smp_processor_id()), raw_smp_processor_id()); dd = kzalloc_node(sizeof(struct driver_data), GFP_KERNEL, my_node); - if (dd == NULL) { - dev_err(&pdev->dev, - "Unable to allocate memory for driver data\n"); + if (!dd) return -ENOMEM; - } /* Attach the private data to this PCI device. */ pci_set_drvdata(pdev, dd); -- 2.13.4