From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754865AbdEJUdm (ORCPT ); Wed, 10 May 2017 16:33:42 -0400 Received: from mout.web.de ([212.227.15.4]:51503 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754184AbdEJUdc (ORCPT ); Wed, 10 May 2017 16:33:32 -0400 To: devicetree@vger.kernel.org, Frank Rowand , Rob Herring Cc: LKML , kernel-janitors@vger.kernel.org, Wolfram Sang From: SF Markus Elfring Subject: [PATCH] of/unittest: Delete an error message for a failed memory allocation in three functions Message-ID: <958edc32-bc4d-4f3b-52d5-8a13aa36fd61@users.sourceforge.net> Date: Wed, 10 May 2017 22:33:22 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.1.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:qfoK8mcHfNx888qmVD4RrnhYFgHhMa4FUCT7J9iqrwSE78qNFXg M5zhJsHz9I6T/nnYTX+r45vHVr7RhS6ocwnLg0qpmQI5vD/7i6sG2xCQSczDswGUc3by6Ev 0RCCWdsv4JIsDCnOiWOln0vYRRSluqwKj2MsaLM0hn4f6hyuOHwV7XyQBvLBxWbCyxzoHDA 3lPLO7jjg73hfIzxr3rRQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:MBLzMmJST34=:RlTiaxPXoWhwPDhJT1t/j2 48HRzr4hDXmsvRyZ6aeWTL3oneS6lS6XfmwZf09FtHbRY2Din7GfYBr35cADCDXQvL6MsAWfS QgJwhG7qRDMRIdOXzffflZ5tGUrlcXODBsnLgJCO0xLg0A6B0tWhfjy+VI1Rdz3qGuDIeJNzr Zc6HaOqebJSWu1Ivj2Oj0eiGPY6T9C/Z32N+GzieWChDYaB73zAnRu2JiN6UuWCF/9bYyXBOx aWCeXk7sheEV2+wc5vMKuOARwlrRHCnV/qLbt+e1p71EiVE6fMQn8iku8RRwjij4RaUHDbHkB mF31hqpmPwaVLI3sBRWVWHnviaIMRRahG3WNugPEtxhSSaMikGbs3OPA0UA7hp9bwep44Csxx 5BpuUWXpk5n41eNJia1yBCZNKyB1esaDyU8jwZUbLFaaCGlObhduNrUdtwiHSueAYx2wQV1YH HdFy5nb1MkukKT67vcDJBE1PetgTOgOclWDzZj+6ptTBszTvJnRMlsH5Wlut+XeEufSBc4tEX xw+OBp9QSaPLvJGsq/26KvYRUHlmx3rglyVj02tZFeO7UOPgirso0LOwXf6rJMA3MUB+b3ttx HbToO3J+17vWieWbHeBDD3XOlgYkG6r01+tBLe/GUxpz9jPPHzoFRppDYovTZjuBxpSkBGMEu dYkuergC8IYtmkNHJcyrUxoC8AHk0AecO3x7CThTJ3idGF7mZ1WYyqjblaDQO+CFjum5J8g6u r3D0kaEr18mROEIh8gBSWHVgl3Y7fnJ4JqMrAMtucbkmKPMeyfMn7Usc7Wbn0zBb2veuygZfd hEiPN4/ Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Wed, 10 May 2017 22:20:52 +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/of/unittest.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c index 987a1530282a..9554f83a0260 100644 --- a/drivers/of/unittest.c +++ b/drivers/of/unittest.c @@ -914,12 +914,9 @@ static int __init unittest_data_add(void) /* creating copy */ unittest_data = kmemdup(__dtb_testcases_begin, size, GFP_KERNEL); - - if (!unittest_data) { - pr_warn("%s: Failed to allocate memory for unittest_data; " - "not running tests\n", __func__); + if (!unittest_data) return -ENOMEM; - } + of_fdt_unflatten_tree(unittest_data, NULL, &unittest_data_node); if (!unittest_data_node) { pr_warn("%s: No tree to attach; not running tests\n", __func__); @@ -1593,12 +1590,9 @@ static int unittest_i2c_bus_probe(struct platform_device *pdev) } dev_dbg(dev, "%s for node @%s\n", __func__, np->full_name); - std = devm_kzalloc(dev, sizeof(*std), GFP_KERNEL); - if (!std) { - dev_err(dev, "Failed to allocate unittest i2c data\n"); + if (!std) return -ENOMEM; - } /* link them together */ std->pdev = pdev; @@ -2062,10 +2056,8 @@ static int __init overlay_data_add(int onum) * will create pointers to the passed in FDT in the EDT. */ info->data = kmemdup(info->dtb_begin, size, GFP_KERNEL); - if (!info->data) { - pr_err("unable to allocate memory for data, %d\n", onum); + if (!info->data) return 0; - } of_fdt_unflatten_tree(info->data, NULL, &info->np_overlay); if (!info->np_overlay) { -- 2.12.3