From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751719AbdHGM6I (ORCPT ); Mon, 7 Aug 2017 08:58:08 -0400 Received: from mout.web.de ([212.227.15.3]:56431 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750751AbdHGM6H (ORCPT ); Mon, 7 Aug 2017 08:58:07 -0400 Subject: [PATCH 1/5] block-skd: Delete an error message for a failed memory allocation in three functions From: SF Markus Elfring To: Andy Shevchenko , Arnd Bergmann , Geliang Tang , Jens Axboe , kernel-janitors@vger.kernel.org Cc: LKML References: <56b55301-2db3-9c0b-297f-c2115fd92c6c@users.sourceforge.net> Message-ID: Date: Mon, 7 Aug 2017 14:57:58 +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: <56b55301-2db3-9c0b-297f-c2115fd92c6c@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:++ZflF/ZibnsrstDyBQpnC0R6PVPU1DeyKsE5r4vJ/1G1MB10rI 7tPMlrZJN4LEX8JOnrVbxfYMWwUz49kkT5V64zhuWcaNldz9fBL3DszRSFSpT0Bx9ZV7Qcl W28CWeDKEef7inkDN/fmZb3H7F2HbU5QOcmYT1OgNmXMMCOJBkWiRgyL6VNdJBw2Rv723oV UqgXjVnPOOTDi1uRO/TVQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:emFfDHP+BGc=:cSheSwlWOuh/29CrTEErQA Drz/p2rC09whP3kNIu5kuY4/qAyF0jFTbRr5ltYIjBadqIm2KMIMMKwrkwVkpDrhwTOzRq8dx fK/3ZQ+Xex7JMq/GhSL4CC+/sbHRfTuI8szqJIw0DSUCfhkQ9Qv/g+sIdsrhAtJxG66tJP3T6 KaZ4djIsYhfAwHGM8RRbN4TkDzTPoJx+D3R7ywSMhMBwj2X8mPE8h81hJ4ZOWz8/hDhYt/5Wn kgXrLoSfiWxMUi0BfZ7yg8zEfiy35v0gbbs/sR7WKIdi4QMTBK1D6OLPTAojrszMY+vcodLtv H8BaaX5dxq0feXa8/o7b2Rl/QEwdopZ4ORyVf2YsHgMGW1DPJALbE+lt4VLOjm58cv/J8V7iD Y/rcY+sNxeMIrBQnpNHkxutaq/zok0GwrsHgEGarr9MLhmHlwTIaUc/NDXX96ZnPWwcrnxHL9 b0uFZ2A9Cqnk4LdJEk29nDsP8fzSk1AANiIzm0/by8EHhhmEqbn7t+Iae7v0DANiIq/aS+CFJ +tgYvBqH7PF5UuJUbUejs9lomtlZJzAnIwqQbRLGmFEFKbtkapoNA+Xp/BCSoMZWrZk9FNjzQ xwzmaMoP8qjwdRC+uS1TV9WU+cL4+zkos8MB7wF8z5E5OgepF2zcWln8QqHnKCqamOoyECIlE 2R7E9Ofv/DgsouqeOQrPOL6SdZjdx72ZMqZfTITWaYzDwnbOJiciYzX/jJX21/n36C1d640IH 9v/rMfXm/GfNQ5sx/eXBa4zuS7RKI/iFQqJZBrVxeiNEmQTxhpDNiUgQ2z0ZcVEZIaaBgTDMv mTf5ZLeRr62gxCnUJOW1t7o1Olo2VxNV+6ETyeC2On/FSa5AwE= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Mon, 7 Aug 2017 13:24:59 +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/skd_main.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/drivers/block/skd_main.c b/drivers/block/skd_main.c index d0368682bd43..c90c05555d94 100644 --- a/drivers/block/skd_main.c +++ b/drivers/block/skd_main.c @@ -1392,12 +1392,9 @@ static int skd_sg_io_get_and_check_args(struct skd_device *skdev, size_t iov_data_len; iov = kmalloc(nbytes, GFP_KERNEL); - if (iov == NULL) { - pr_debug("%s:%s:%d alloc iovec failed %d\n", - skdev->name, __func__, __LINE__, - sgp->iovec_count); + if (!iov) return -ENOMEM; - } + sksgio->iov = iov; sksgio->iovcnt = sgp->iovec_count; @@ -3859,8 +3856,6 @@ static int skd_acquire_msix(struct skd_device *skdev) sizeof(struct skd_msix_entry), GFP_KERNEL); if (!skdev->msix_entries) { rc = -ENOMEM; - pr_err("(%s): msix table allocation error\n", - skd_name(skdev)); goto out; } @@ -4309,12 +4304,8 @@ static struct skd_device *skd_construct(struct pci_dev *pdev) int rc; skdev = kzalloc(sizeof(*skdev), GFP_KERNEL); - - if (!skdev) { - pr_err(PFX "(%s): memory alloc failure\n", - pci_name(pdev)); + if (!skdev) return NULL; - } skdev->state = SKD_DRVR_STATE_LOAD; skdev->pdev = pdev; -- 2.13.4