From patchwork Mon Dec 18 21:28:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 10121877 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 677E560390 for ; Mon, 18 Dec 2017 21:29:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 56D7D28800 for ; Mon, 18 Dec 2017 21:29:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4B7662884E; Mon, 18 Dec 2017 21:29:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DB67328800 for ; Mon, 18 Dec 2017 21:29:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933638AbdLRV3I (ORCPT ); Mon, 18 Dec 2017 16:29:08 -0500 Received: from mout.web.de ([212.227.17.11]:55367 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934812AbdLRV3H (ORCPT ); Mon, 18 Dec 2017 16:29:07 -0500 Received: from [192.168.1.3] ([78.49.167.160]) by smtp.web.de (mrweb102 [213.165.67.124]) with ESMTPSA (Nemesis) id 0MRCnT-1eZcEX0MGt-00UdSj; Mon, 18 Dec 2017 22:28:42 +0100 Subject: [PATCH 1/2] platform/x86/thinkpad_acpi: Delete an error message for a failed memory allocation in three functions From: SF Markus Elfring To: ibm-acpi-devel@lists.sourceforge.net, platform-driver-x86@vger.kernel.org, Andy Shevchenko , Darren Hart , Henrique de Moraes Holschuh Cc: LKML , kernel-janitors@vger.kernel.org References: <81459d11-693a-eb51-9173-9c189677f422@users.sourceforge.net> Message-ID: Date: Mon, 18 Dec 2017 22:28:01 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 In-Reply-To: <81459d11-693a-eb51-9173-9c189677f422@users.sourceforge.net> Content-Language: en-GB X-Provags-ID: V03:K0:U0AGrDZTL+KGPg0cD+ruIeIElxeGCKhsoFcub4vVnGroQg8dJDR jSnt/EPPA6E1m4SziYYDaIw2FiSu+tOiMFNV/OhVqTOdyNUXUf9zcpeipsB5YThJ3P+iziG mp9S++Gy+9flX4mAeyZg9WPUmx25q7Qqe6ky/8IYscyzYJeJlwnxa9uQCHMfAL7NOPD9Fv/ Za8BVI08f35uaATepPELg== X-UI-Out-Filterresults: notjunk:1; V01:K0:ZcDpHA0DxhE=:rzDSwlmPZo/kgeJNKANylq WDgXW8fBDXwjCnigepNqfp8R0W3d5gjB3g7l1UdDd8XfSbwMIVcXIP/j5m332cHlvOEHAvROH Zn3mZWZ+2ocIgv5MUkXC/0yFRZtt7BAcYLWLF2nDS8vCGdw3w1htSUVRoDCOJQv6nn01z7frI s9N5H8kyYU/Jkibg57mLKkPJAQq3XmdV70BFFO8megTpAe43g2MOSUvNkfJaf5415a48iF1pX vQaNz/4XIP6Jq/j3R2Fq44KtnhCdfaviP9Wk5v/BOsfQmhl4xE2oJb5oBItRNtIS+ezubKJHY M1Mg7qpdSWpQOvg3P3GVeOmoHlsAddPr9EPjteKL4At7PeJIXISEtM2dj/ylqsev9RQN2pINx Al9WVEQgS16SXEVoB3C9ZFXq+9pono8/CpRnCqdtJY/e3sxhQj8C7NfYg4hthTByIRQals58G p4LE0rBpZaIte/Pbs0lxBl1/KVNKDpOyU8/iX8eABaC4dSL4DGi7RYUUffCBjSz9N02E7DVWX naD3ZyxmIpm5mQuJj6w9nQLOCM0k2qTSD4PYayvihCugzcmN0VnvJ9v7uzDQ78lwAiW1cO6OX YjTjAHR6mEct7rZOI7k8Utre4iZEYctJvo2muuNKbq0Mhh1gYYzXw3wztXMK7o0sa1qvXLg2H 7tpAqM5LfDanQgzcOiIEIrS3U7xryNXE2ZE2DK3QYjgcIy9tcYl66vKF8ZZpwR/Vjx0c3HD8R Juvtny8ySJHNySdKpWu2eNTQEROIT5dAWW0KkrsHCcBgElS5OhRzCnEsdpsrIKYqYgaBXxRmT xMLK7+UXzsV1q0fDJdPYama6CDPKa4YyPGbtbGfHddMod1Zjl9EKCe0RCgUv5uKofpFctW3 Sender: platform-driver-x86-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Markus Elfring Date: Mon, 18 Dec 2017 22:08:49 +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/platform/x86/thinkpad_acpi.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index 117be48ff4de..729144925880 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c @@ -816,10 +816,8 @@ static int __init register_tpacpi_subdriver(struct ibm_struct *ibm) BUG_ON(!ibm->acpi); ibm->acpi->driver = kzalloc(sizeof(struct acpi_driver), GFP_KERNEL); - if (!ibm->acpi->driver) { - pr_err("failed to allocate memory for ibm->acpi->driver\n"); + if (!ibm->acpi->driver) return -ENOMEM; - } sprintf(ibm->acpi->driver->name, "%s_%s", TPACPI_NAME, ibm->name); ibm->acpi->driver->ids = ibm->acpi->hid; @@ -3639,7 +3637,6 @@ static int __init hotkey_init(struct ibm_init_struct *iibm) hotkey_keycode_map = kmalloc(TPACPI_HOTKEY_MAP_SIZE, GFP_KERNEL); if (!hotkey_keycode_map) { - pr_err("failed to allocate memory for key map\n"); res = -ENOMEM; goto err_exit; } @@ -5996,10 +5993,8 @@ static int __init led_init(struct ibm_init_struct *iibm) tpacpi_leds = kzalloc(sizeof(*tpacpi_leds) * TPACPI_LED_NUMLEDS, GFP_KERNEL); - if (!tpacpi_leds) { - pr_err("Out of memory for LED data\n"); + if (!tpacpi_leds) return -ENOMEM; - } for (i = 0; i < TPACPI_LED_NUMLEDS; i++) { tpacpi_leds[i].led = -1;