From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753968AbdL1VrP (ORCPT ); Thu, 28 Dec 2017 16:47:15 -0500 Received: from mout.web.de ([217.72.192.78]:61377 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750982AbdL1VrN (ORCPT ); Thu, 28 Dec 2017 16:47:13 -0500 Subject: [PATCH 2/3] pcmcia/cis: Delete an error message for a failed memory allocation in two functions From: SF Markus Elfring To: linux-pcmcia@lists.infradead.org, Bhumika Goyal , Greg Kroah-Hartman Cc: LKML , kernel-janitors@vger.kernel.org References: <4eaa454f-8b57-fe0a-4802-3676bc2f582e@users.sourceforge.net> Message-ID: Date: Thu, 28 Dec 2017 22:46:54 +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: <4eaa454f-8b57-fe0a-4802-3676bc2f582e@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:3kj+zCY3Iyf5Ur60ee6vZxU6EUtWUvJ1U7Q7PprYwzWprhXUtFO knQxQ8Zd88y23XPtVDcwbXq/Y9eyuqrXl2xpG2wI8aR/AViVXqRUzKu63cxsNBXyrJTtQMo 4qw9hjCHH31QuRG+oTULPsyW3YA7J2kbmz944xERkX4h6Nq0CaTRfElpIblKXJ4SPQkt+lk R9/VHT0t8dhFtWedkCnyA== X-UI-Out-Filterresults: notjunk:1;V01:K0:ii9M9qQc/qk=:fWbMm9vHucuk0kr3Q0TloC srZXYWxVcNNEplVnHLCzinoCpcD4IeyNDRdHNdZi2ec08WhE8YTr1L6dcNAFpAjfpIRXd61ax OwzYLAHSQ8aI7z59OfffqvwCnYbzeuigJRDVcglxwmhSCXND3syxmTh7wkFKOtWfZbnJBm+Gp NHKlcsXuZbwMMFufLyJQNuXotep1oa1nzql1HRZUzMjjANfhFeGawy9DgoFg+UpR/ViT316In aCeAysy6qxJpFZsnaDN0p7R+dj1+dInbw6plvswAueWMrLUHUWUEryYHag/8qmfLAuBuCPwKw aKchDUNQ/uiw3U2eO4JpkGsTRNevK75AZWUd5L9CEarABCHB0HSdnMcc2BMV/jAAYP+xyJfDr /LxBpjJ6JBHjJVjAz+PruS5tk7R+oGOo4TamMprqDNXfs3TIYPAXewi1laAF/Z5h6n3wYzTG9 Ixu7iZFMN0kpF45qhBj+IxeEuysVTYafwazY4OAAcYXrG2oV0P7D3vUNA8Wm2qgBIXUU4zOJZ XzYOmu5R/B6v4LOA95gjOAqom1/xazX8GOi9VgErHf5fk2Ip18XQn3L8ksHCGh77jQoPjTXi7 TBXJEFmGF2ikGNt9oAHIFn+jNY62j6hjmHfezbhU+eGLZz+4x7bY1dACMS2MO/i7LOiaxiAWp W9Ru5+P+7EocyLvL4f0eLcFO2yUQcJiy5PSEhgnYZBKEEVSXzYPiIO9e6OBkOFKhOj4ncPeEE kDXpG54ctMaTvpM2ojDZ9jcfmh7quvJdWn8cFy8T0YOPi31DIaPDwerlR5coNShLl4H0OqCM1 BIboTwo+z8Beeve7ujzScTUkukySeRNqgjySvzj4uPWDejtNI0= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Thu, 28 Dec 2017 22:20:51 +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 --- drivers/pcmcia/pcmcia_cis.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/pcmcia/pcmcia_cis.c b/drivers/pcmcia/pcmcia_cis.c index 1c05d74e850d..ffcd014b7bc1 100644 --- a/drivers/pcmcia/pcmcia_cis.c +++ b/drivers/pcmcia/pcmcia_cis.c @@ -43,10 +43,9 @@ int pccard_read_tuple(struct pcmcia_socket *s, unsigned int function, int ret; buf = kmalloc(256, GFP_KERNEL); - if (buf == NULL) { - dev_warn(&s->dev, "no memory to read tuple\n"); + if (!buf) return -ENOMEM; - } + tuple.DesiredTuple = code; tuple.Attributes = 0; if (function == BIND_FN_ALL) @@ -93,10 +92,8 @@ int pccard_loop_tuple(struct pcmcia_socket *s, unsigned int function, int ret; buf = kzalloc(256, GFP_KERNEL); - if (buf == NULL) { - dev_warn(&s->dev, "no memory to read tuple\n"); + if (!buf) return -ENOMEM; - } tuple.TupleData = buf; tuple.TupleDataMax = 255; -- 2.15.1