From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754035AbdHUU4t (ORCPT ); Mon, 21 Aug 2017 16:56:49 -0400 Received: from mout.web.de ([212.227.15.4]:64344 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753541AbdHUU4r (ORCPT ); Mon, 21 Aug 2017 16:56:47 -0400 Subject: [PATCH 3/4] w1-masters: Delete an error message for a failed memory allocation in four functions From: SF Markus Elfring To: "Andrew F. Davis" , Christophe Jaillet , Greg Kroah-Hartman , "Gustavo A. R. Silva" , Evgeniy Polyakov , "Maciej S. Szmigiero" , Sebastian Reichel , Wei Yongjun Cc: LKML , kernel-janitors@vger.kernel.org References: Message-ID: Date: Mon, 21 Aug 2017 22:56:19 +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: Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:MAlix2GQpDvXBOlcOl3hFTpCt7YjJMsJkEWeosDp6+ZrjpgjStC 0i7J0iBxxrVTTgTk+yQzc9CinGcx/luyPKb2COijkDdsrGXmfhc4mLX6uFfBsjr3JeHAsHl sTAu3SKOsniVVj8bFUNd3pGxACTVgGc1KGYEEImi2bzDGBLiHJ4n60zM1n9HinnjU6o0sQD Jl8hoQv0geG2GwG6Jzy9w== X-UI-Out-Filterresults: notjunk:1;V01:K0:1VIti8ALO3s=:CA8qKavmpxU1Xf31cncS+F OQN7BcY7RJFYc/dPTJwr4fejXTLyMLpH93qu0T20InWMBLJdDP2698mZOyKTgipUyacExzAdd IjFQKqqVfxCIodJRDY+0XQEmwOMfESg9kJDdwA0I0xANaFX028XAIUDLkhTGWoANB2wJxclu4 NxWovKFfkokNWZXMJtMKpaxlsyGjSr3yTuvio4YPXAPd3C1sOzhFSlrkgQuTMgaRoWylMxAy4 MexZT/sOXbYwtJAcW5QWzQEPB8nDPxHHFNRUOE9dXJg5/HOEN7eOf/vexURQWoxqbp4xFrFpE jvz4bghVzLGQyYsVVm10vcTAfxqgd8ZBvUceCvnN44DNnE2c5MCL3TxJkwbD/MpNEabWsaMmY OUrZyn++hI/E6UL9O3rh0Lc80jDR0iXBJFy/A9kQVTHRlxRnZZQ30CP8BNKKZ6uNd1ZPi+cWq C5BaS3moPCBmI8QSAvVt2G/ntohqpRIhVWHuOyDPOeOAESBVsObY9LSsHBz+IcFYutDtTlyWI lmLlBmRV1Jto6wTgbgkKeAJdrzePd3SUA/SCduqbIefGHmsRQZTGkRQJzMcM/cvBRNwbNxJpq 8bOq1o5MDxrLO4jOCRjYgh/YTjKVTSa7VO53xfq18XOdW2Sos67Jzj/3UNuZ/qL4lr20ItbRp mlcf5BwqGOeUh52Rxzo2X4LVXzrehWTsLla6QXc9rxdcgT7bNbW6kNnoB+j7++Gq8DpXPilMt dFLcwwuYAzN4yuRfY4uH4j8dn7gGTCRWT87TetmbGLp94DSuxL8y4l83uJYQAb6xcECgfkYVr Nd09dFYwftYL72LeGTaVJd8BRYsWasLez1qy+SK7cT/SS44OMiY7hX7Eb0W6LE1uKkJ1t9V Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Mon, 21 Aug 2017 21:40:29 +0200 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/w1/masters/ds2490.c | 5 ++--- drivers/w1/masters/matrox_w1.c | 7 +------ drivers/w1/masters/omap_hdq.c | 4 +--- drivers/w1/masters/w1-gpio.c | 4 +--- 4 files changed, 5 insertions(+), 15 deletions(-) diff --git a/drivers/w1/masters/ds2490.c b/drivers/w1/masters/ds2490.c index 46ccb2fc4f60..c0ee6ca9ce93 100644 --- a/drivers/w1/masters/ds2490.c +++ b/drivers/w1/masters/ds2490.c @@ -998,7 +998,6 @@ static int ds_probe(struct usb_interface *intf, - if (!dev) { - pr_info("Failed to allocate new DS9490R structure.\n"); + if (!dev) return -ENOMEM; - } + dev->udev = usb_get_dev(udev); if (!dev->udev) { err = -ENOMEM; diff --git a/drivers/w1/masters/matrox_w1.c b/drivers/w1/masters/matrox_w1.c index d83d7c99d81d..62be2f9cdb4e 100644 --- a/drivers/w1/masters/matrox_w1.c +++ b/drivers/w1/masters/matrox_w1.c @@ -140,10 +140,5 @@ static int matrox_w1_probe(struct pci_dev *pdev, const struct pci_device_id *ent - if (!dev) { - dev_err(&pdev->dev, - "%s: Failed to create new matrox_device object.\n", - __func__); + if (!dev) return -ENOMEM; - } - dev->bus_master = (struct w1_bus_master *)(dev + 1); diff --git a/drivers/w1/masters/omap_hdq.c b/drivers/w1/masters/omap_hdq.c index 83fc9aab34e8..6349fcd650dc 100644 --- a/drivers/w1/masters/omap_hdq.c +++ b/drivers/w1/masters/omap_hdq.c @@ -669,7 +669,5 @@ static int omap_hdq_probe(struct platform_device *pdev) - if (!hdq_data) { - dev_dbg(&pdev->dev, "unable to allocate memory\n"); + if (!hdq_data) return -ENOMEM; - } hdq_data->dev = dev; platform_set_drvdata(pdev, hdq_data); diff --git a/drivers/w1/masters/w1-gpio.c b/drivers/w1/masters/w1-gpio.c index a90728ceec5a..6e8b18bf9fb1 100644 --- a/drivers/w1/masters/w1-gpio.c +++ b/drivers/w1/masters/w1-gpio.c @@ -133,7 +133,5 @@ static int w1_gpio_probe(struct platform_device *pdev) - if (!master) { - dev_err(&pdev->dev, "Out of memory\n"); + if (!master) return -ENOMEM; - } err = devm_gpio_request(&pdev->dev, pdata->pin, "w1"); if (err) { -- 2.14.0