From patchwork Sat Nov 9 09:00:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Elfring X-Patchwork-Id: 1192385 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=web.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=web.de header.i=@web.de header.b="EqdzMrcc"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 479B251PY5z9sPL for ; Sat, 9 Nov 2019 20:01:01 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726458AbfKIJAw (ORCPT ); Sat, 9 Nov 2019 04:00:52 -0500 Received: from mout.web.de ([212.227.15.14]:58839 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726143AbfKIJAw (ORCPT ); Sat, 9 Nov 2019 04:00:52 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1573290031; bh=G5WT9018vUhaMGJJGfBWCHGF4o3V3lUzPY8ENWHnJlY=; h=X-UI-Sender-Class:Subject:From:To:Cc:References:Date:In-Reply-To; b=EqdzMrcc7UrofWYjNYJ4Bzm1gN9iafDRxHnhhYn/5EiXp6FjeY1pz+bq3936wtBGf JouVkCsPX7c418nzVzuz50VtN2OMnaN6JPIwY+7FidxTzLQ6f34qUzfLyk+FQfEiJU KAldSQpUdGxs4ysgKVBj5orAcb0RbKxcLQG7y3iY= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from [192.168.1.2] ([2.243.82.67]) by smtp.web.de (mrweb001 [213.165.67.108]) with ESMTPSA (Nemesis) id 0LZeou-1i3yXD1qrE-00lYd6; Sat, 09 Nov 2019 10:00:31 +0100 Subject: [PATCH 1/3] fsl/fman: Add missing put_device() calls in mac_probe() From: Markus Elfring To: netdev@vger.kernel.org, "David S. Miller" , Madalin Bucur Cc: LKML , kernel-janitors@vger.kernel.org, Wen Yang References: <132e8369-c4da-249f-76b8-834e394dc6d5@web.de> Autocrypt: addr=Markus.Elfring@web.de; prefer-encrypt=mutual; keydata= mQINBFg2+xABEADBJW2hoUoFXVFWTeKbqqif8VjszdMkriilx90WB5c0ddWQX14h6w5bT/A8 +v43YoGpDNyhgA0w9CEhuwfZrE91GocMtjLO67TAc2i2nxMc/FJRDI0OemO4VJ9RwID6ltwt mpVJgXGKkNJ1ey+QOXouzlErVvE2fRh+KXXN1Q7fSmTJlAW9XJYHS3BDHb0uRpymRSX3O+E2 lA87C7R8qAigPDZi6Z7UmwIA83ZMKXQ5stA0lhPyYgQcM7fh7V4ZYhnR0I5/qkUoxKpqaYLp YHBczVP+Zx/zHOM0KQphOMbU7X3c1pmMruoe6ti9uZzqZSLsF+NKXFEPBS665tQr66HJvZvY GMDlntZFAZ6xQvCC1r3MGoxEC1tuEa24vPCC9RZ9wk2sY5Csbva0WwYv3WKRZZBv8eIhGMxs rcpeGShRFyZ/0BYO53wZAPV1pEhGLLxd8eLN/nEWjJE0ejakPC1H/mt5F+yQBJAzz9JzbToU 5jKLu0SugNI18MspJut8AiA1M44CIWrNHXvWsQ+nnBKHDHHYZu7MoXlOmB32ndsfPthR3GSv jN7YD4Ad724H8fhRijmC1+RpuSce7w2JLj5cYj4MlccmNb8YUxsE8brY2WkXQYS8Ivse39MX BE66MQN0r5DQ6oqgoJ4gHIVBUv/ZwgcmUNS5gQkNCFA0dWXznQARAQABtCZNYXJrdXMgRWxm cmluZyA8TWFya3VzLkVsZnJpbmdAd2ViLmRlPokCVAQTAQgAPhYhBHDP0hzibeXjwQ/ITuU9 Figxg9azBQJYNvsQAhsjBQkJZgGABQsJCAcCBhUICQoLAgQWAgMBAh4BAheAAAoJEOU9Figx g9azcyMP/iVihZkZ4VyH3/wlV3nRiXvSreqg+pGPI3c8J6DjP9zvz7QHN35zWM++1yNek7Ar OVXwuKBo18ASlYzZPTFJZwQQdkZSV+atwIzG3US50ZZ4p7VyUuDuQQVVqFlaf6qZOkwHSnk+ CeGxlDz1POSHY17VbJG2CzPuqMfgBtqIU1dODFLpFq4oIAwEOG6fxRa59qbsTLXxyw+PzRaR LIjVOit28raM83Efk07JKow8URb4u1n7k9RGAcnsM5/WMLRbDYjWTx0lJ2WO9zYwPgRykhn2 sOyJVXk9xVESGTwEPbTtfHM+4x0n0gC6GzfTMvwvZ9G6xoM0S4/+lgbaaa9t5tT/PrsvJiob kfqDrPbmSwr2G5mHnSM9M7B+w8odjmQFOwAjfcxoVIHxC4Cl/GAAKsX3KNKTspCHR0Yag78w i8duH/eEd4tB8twcqCi3aCgWoIrhjNS0myusmuA89kAWFFW5z26qNCOefovCx8drdMXQfMYv g5lRk821ZCNBosfRUvcMXoY6lTwHLIDrEfkJQtjxfdTlWQdwr0mM5ye7vd83AManSQwutgpI q+wE8CNY2VN9xAlE7OhcmWXlnAw3MJLW863SXdGlnkA3N+U4BoKQSIToGuXARQ14IMNvfeKX NphLPpUUnUNdfxAHu/S3tPTc/E/oePbHo794dnEm57LuuQINBFg2+xABEADZg/T+4o5qj4cw nd0G5pFy7ACxk28mSrLuva9tyzqPgRZ2bdPiwNXJUvBg1es2u81urekeUvGvnERB/TKekp25 4wU3I2lEhIXj5NVdLc6eU5czZQs4YEZbu1U5iqhhZmKhlLrhLlZv2whLOXRlLwi4jAzXIZAu 76mT813jbczl2dwxFxcT8XRzk9+dwzNTdOg75683uinMgskiiul+dzd6sumdOhRZR7YBT+xC wzfykOgBKnzfFscMwKR0iuHNB+VdEnZw80XGZi4N1ku81DHxmo2HG3icg7CwO1ih2jx8ik0r riIyMhJrTXgR1hF6kQnX7p2mXe6K0s8tQFK0ZZmYpZuGYYsV05OvU8yqrRVL/GYvy4Xgplm3 DuMuC7/A9/BfmxZVEPAS1gW6QQ8vSO4zf60zREKoSNYeiv+tURM2KOEj8tCMZN3k3sNASfoG fMvTvOjT0yzMbJsI1jwLwy5uA2JVdSLoWzBD8awZ2X/eCU9YDZeGuWmxzIHvkuMj8FfX8cK/ 2m437UA877eqmcgiEy/3B7XeHUipOL83gjfq4ETzVmxVswkVvZvR6j2blQVr+MhCZPq83Ota xNB7QptPxJuNRZ49gtT6uQkyGI+2daXqkj/Mot5tKxNKtM1Vbr/3b+AEMA7qLz7QjhgGJcie qp4b0gELjY1Oe9dBAXMiDwARAQABiQI8BBgBCAAmFiEEcM/SHOJt5ePBD8hO5T0WKDGD1rMF Alg2+xACGwwFCQlmAYAACgkQ5T0WKDGD1rOYSw/+P6fYSZjTJDAl9XNfXRjRRyJSfaw6N1pA Ahuu0MIa3djFRuFCrAHUaaFZf5V2iW5xhGnrhDwE1Ksf7tlstSne/G0a+Ef7vhUyeTn6U/0m +/BrsCsBUXhqeNuraGUtaleatQijXfuemUwgB+mE3B0SobE601XLo6MYIhPh8MG32MKO5kOY hB5jzyor7WoN3ETVNQoGgMzPVWIRElwpcXr+yGoTLAOpG7nkAUBBj9n9TPpSdt/npfok9ZfL /Q+ranrxb2Cy4tvOPxeVfR58XveX85ICrW9VHPVq9sJf/a24bMm6+qEg1V/G7u/AM3fM8U2m tdrTqOrfxklZ7beppGKzC1/WLrcr072vrdiN0icyOHQlfWmaPv0pUnW3AwtiMYngT96BevfA qlwaymjPTvH+cTXScnbydfOQW8220JQwykUe+sHRZfAF5TS2YCkQvsyf7vIpSqo/ttDk4+xc Z/wsLiWTgKlih2QYULvW61XU+mWsK8+ZlYUrRMpkauN4CJ5yTpvp+Orcz5KixHQmc5tbkLWf x0n1QFc1xxJhbzN+r9djSGGN/5IBDfUqSANC8cWzHpWaHmSuU3JSAMB/N+yQjIad2ztTckZY pwT6oxng29LzZspTYUEzMz3wK2jQHw+U66qBFk8whA7B2uAU1QdGyPgahLYSOa4XAEGb6wbI FEE= Message-ID: <63d9c06f-7cb8-1c44-1666-12d31f937a31@web.de> Date: Sat, 9 Nov 2019 10:00:27 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.1 MIME-Version: 1.0 In-Reply-To: <132e8369-c4da-249f-76b8-834e394dc6d5@web.de> Content-Language: en-US X-Provags-ID: V03:K1:xzhhk4lZZNRZTh8k0ifOtUV1H/0l3CWU6fPrk6f+PmH5pm6rt9r J8EdPhE+wmNN/8q6edLQyRLTQ4Wpqs1Q5lr4wczoEu5cVKqnsOp7i+XuILO/83WOUo790if zwvayXCOvGpjcWEiT6FZfta2xVs89z2SzU7RT8hR8xDlvqgu4ZIwibK+8YfEtdv3egjMABn bk5BMnhGqARaatDlXs28A== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:98jtglzuN88=:7ap2bALMRyoUcvhsplkDNY OC4hfxHTa2L5M85Uy0nbJlDT6N6/BP2z+J9c8hW9ZknpEJJLOZdd8Fe6fPhtLmbMxTiPZo6rk nyBlhNKdzCmgWsROS3YHz2LADMIniB0aXdQm0hjFi5yVEaZWtirPoDEsgqHPWb89BNsu7r2t3 6jXVKip4LNgldr99nPq7g0+xQUiHetRcEguxdlp6lDzX3XNJmhH5ZJ4lqCCLyO9LtyhbxJhLU YEWTkLWZAJvnaXdXA2rs5ZEP2rfm3srQjo8N57WBqFO+1ICHWeHUOeSuMvK2WwkSTAvxJ7N02 zTCrr6FXMALxy+HLGKPmNBjlmtKdl7CJ359BqcQFc3AhDhferMOGEeL3SQQhs7JmwD5X0vPoa vjRha8pR0jVxz0OvfrDkGJcgTQWjWJgWFFfTTaXw3uJqvHDlJrHI105PFeQnhKxq/D+QZ7G7t +TfvQT5C6UQPq/dd5VXYUeH8yciZ022lRjneEewwzCx0/1PIikUicH+/od+MZNws6mMj8e8I8 Y/bHP57Iov3071FCTU3C5pTwKXNS+wJPHc6N/wRZvXohvXlqjSQkz8lJkkwOxSrQKpQGb2IBW EanR6IVM/Pxz8XdSe2g/ibrprKRioIpn2075JXehLMI06AKpvvR/ASCeqBUjylE0BwiBuuisb 0NBkB6hWciFLLte2bHNUklSwol3YhdXePQ09RCT/TnCV8KxCZw37y+Esj62zK+oo9RR16rsgm 0gYIiNGqsfzKQZRioGMPbA+ttbUeTJleqE4frlbSvCer6kGJQPe08JumeMQ0dcdeJU8d30SLW EFd5cP2VmblLwxnmfGoktmgZuR2+ujVp84DWPvMJz+P+Qx1HVTjvA+c31TEj2lTlPaWHxXnKv 6eOq9QOn7WKtzBdjoqeDH38uq6nIRukfmpJnl15kc9RGvYDTnCh07MCPOGyKYtEniWSGL424b 75jamyN0W8L8StqLXVaWCQU1rEoD0/2dQzzwY+rS9v4wb3Q6L2wTKCJMyQVtc7mIH62yczGbd Bnmsq6RNjbWKehpwjNhO1QD/4JR+vn8cNIDBtrVAl9RxbVLrC4eKQeZWntrH+YmxbiFnxSrHl vqp2m4TEJZ3EeJg8PbdEQxa/S8xMZPuG8uZ0koAwCfryjKfAFfHY5ZdPlc0oix2UwET1iwq2B vqFIXpXzQYna+FJ2DF1OK/a7vwig13cLUTOgH7qKYdzeN2RTZMFUauGxyg5170N+kCgTsYZX2 ulUw7Z9B3MG7j2Tu4ttJC5kjDgD1IwnBs7GPhAO6qwhz4Hp20Q9lZcckRqhM= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Markus Elfring Date: Sat, 9 Nov 2019 08:14:35 +0100 A coccicheck run provided information like the following. drivers/net/ethernet/freescale/fman/mac.c:874:1-7: ERROR: missing put_device; call of_find_device_by_node on line 659, but without a corresponding object release within this function. drivers/net/ethernet/freescale/fman/mac.c:874:1-7: ERROR: missing put_device; call of_find_device_by_node on line 760, but without a corresponding object release within this function. Generated by: scripts/coccinelle/free/put_device.cocci Thus adjust jump targets to fix the exception handling for this function implementation. Fixes: 3933961682a30ae7d405cda344c040a129fea422 ("fsl/fman: Add FMan MAC driver") Signed-off-by: Markus Elfring --- drivers/net/ethernet/freescale/fman/mac.c | 28 ++++++++++++++--------- 1 file changed, 17 insertions(+), 11 deletions(-) -- 2.24.0 diff --git a/drivers/net/ethernet/freescale/fman/mac.c b/drivers/net/ethernet/freescale/fman/mac.c index f0806ace1ae2..e0680257532c 100644 --- a/drivers/net/ethernet/freescale/fman/mac.c +++ b/drivers/net/ethernet/freescale/fman/mac.c @@ -668,7 +668,7 @@ static int mac_probe(struct platform_device *_of_dev) if (err) { dev_err(dev, "failed to read cell-index for %pOF\n", dev_node); err = -EINVAL; - goto _return_of_node_put; + goto _put_device; } /* cell-index 0 => FMan id 1 */ fman_id = (u8)(val + 1); @@ -677,7 +677,7 @@ static int mac_probe(struct platform_device *_of_dev) if (!priv->fman) { dev_err(dev, "fman_bind(%pOF) failed\n", dev_node); err = -ENODEV; - goto _return_of_node_put; + goto _put_device; } of_node_put(dev_node); @@ -687,7 +687,7 @@ static int mac_probe(struct platform_device *_of_dev) if (err < 0) { dev_err(dev, "of_address_to_resource(%pOF) = %d\n", mac_node, err); - goto _return_of_get_parent; + goto _put_parent_device; } mac_dev->res = __devm_request_region(dev, @@ -697,7 +697,7 @@ static int mac_probe(struct platform_device *_of_dev) if (!mac_dev->res) { dev_err(dev, "__devm_request_mem_region(mac) failed\n"); err = -EBUSY; - goto _return_of_get_parent; + goto _put_parent_device; } priv->vaddr = devm_ioremap(dev, mac_dev->res->start, @@ -705,12 +705,12 @@ static int mac_probe(struct platform_device *_of_dev) if (!priv->vaddr) { dev_err(dev, "devm_ioremap() failed\n"); err = -EIO; - goto _return_of_get_parent; + goto _put_parent_device; } if (!of_device_is_available(mac_node)) { err = -ENODEV; - goto _return_of_get_parent; + goto _put_parent_device; } /* Get the cell-index */ @@ -718,7 +718,7 @@ static int mac_probe(struct platform_device *_of_dev) if (err) { dev_err(dev, "failed to read cell-index for %pOF\n", mac_node); err = -EINVAL; - goto _return_of_get_parent; + goto _put_parent_device; } priv->cell_index = (u8)val; @@ -727,7 +727,7 @@ static int mac_probe(struct platform_device *_of_dev) if (IS_ERR(mac_addr)) { dev_err(dev, "of_get_mac_address(%pOF) failed\n", mac_node); err = -EINVAL; - goto _return_of_get_parent; + goto _put_parent_device; } ether_addr_copy(mac_dev->addr, mac_addr); @@ -737,14 +737,14 @@ static int mac_probe(struct platform_device *_of_dev) dev_err(dev, "of_count_phandle_with_args(%pOF, fsl,fman-ports) failed\n", mac_node); err = nph; - goto _return_of_get_parent; + goto _put_parent_device; } if (nph != ARRAY_SIZE(mac_dev->port)) { dev_err(dev, "Not supported number of fman-ports handles of mac node %pOF from device tree\n", mac_node); err = -EINVAL; - goto _return_of_get_parent; + goto _put_parent_device; } for (i = 0; i < ARRAY_SIZE(mac_dev->port); i++) { @@ -770,7 +770,7 @@ static int mac_probe(struct platform_device *_of_dev) dev_err(dev, "dev_get_drvdata(%pOF) failed\n", dev_node); err = -EINVAL; - goto _return_of_node_put; + goto _put_device; } of_node_put(dev_node); } @@ -866,6 +866,12 @@ static int mac_probe(struct platform_device *_of_dev) goto _return; +_put_parent_device: + put_device(&of_dev->dev); + goto _return_of_get_parent; + +_put_device: + put_device(&of_dev->dev); _return_of_node_put: of_node_put(dev_node); _return_of_get_parent: From patchwork Sat Nov 9 09:03:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Elfring X-Patchwork-Id: 1192386 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=web.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=web.de header.i=@web.de header.b="KD54TrJu"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 479B501LQMz9sPT for ; Sat, 9 Nov 2019 20:03:32 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726591AbfKIJD0 (ORCPT ); Sat, 9 Nov 2019 04:03:26 -0500 Received: from mout.web.de ([212.227.15.4]:33809 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726145AbfKIJDY (ORCPT ); Sat, 9 Nov 2019 04:03:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1573290197; bh=qoIQImRdmD44LsZ6ub5WyhVN02SxMTzaAmh82B3FbiQ=; h=X-UI-Sender-Class:Subject:From:To:Cc:References:Date:In-Reply-To; b=KD54TrJuFUMbOY4o01necvCS3Jz4zylZAHVYsSzc2AJY9D0KKZh5bHhIt+BRLICn5 JQxkmGGlZ31Bk49lGHGP+WCJr94YoqXQZjWR3LJntT/Fy9whju4N+wat0BmCPZjP3M wooicXx+UapWia9jjXzgAKgW0tzMR2npnNjQTOQU= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from [192.168.1.2] ([2.243.82.67]) by smtp.web.de (mrweb003 [213.165.67.108]) with ESMTPSA (Nemesis) id 0M6Dve-1hiZkl0830-00y828; Sat, 09 Nov 2019 10:03:17 +0100 Subject: [PATCH 2/3] fsl/fman: Use common error handling code in mac_probe() From: Markus Elfring To: netdev@vger.kernel.org, "David S. Miller" , Madalin Bucur Cc: LKML , kernel-janitors@vger.kernel.org References: <132e8369-c4da-249f-76b8-834e394dc6d5@web.de> Autocrypt: addr=Markus.Elfring@web.de; prefer-encrypt=mutual; keydata= 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 FEE= Message-ID: <8af4d161-cf85-b40f-6cc1-7ccf6d505918@web.de> Date: Sat, 9 Nov 2019 10:03:15 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.1 MIME-Version: 1.0 In-Reply-To: <132e8369-c4da-249f-76b8-834e394dc6d5@web.de> Content-Language: en-US X-Provags-ID: V03:K1:4ifrebuGtQEnat8+4sGV6OJL8On2wzvwy92TxOtI89YYT+2OM/2 v89WSktNRUYt4BVGwP6MHHz/MPglNojWC8Xy8Xy0NidQM1wa+iQpA3HthN9WJqg0Jl7yakY Gj5042adq20Emlm/539xrKh0NxQI6GmESKdPH4rgaZ6oEcJ5vmKNebnRAxFs6LyFNTLcwe9 dAZAxyq8xFqaKdNXwKHxg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:UJRVT5At2G8=:OSqbbWdF15C4JMCF4hN0mC fe5Yy8W97SrYl3Kk7rWfc4Robm9eOFHz+Y1voo1uZX9BeQXJp537uU5Ytmx3tgUAaNGERnF+b 5VN+AoxEMozndEFtu9Tt6F5RiPs5PFMJNrwcoKTheU3gE5Vbmu4DYScCqTNZRtEoczW69qcGw SmhDC2LY99KkTlFzp30oer0rwywUEtiDPxWAhku8fsBjsqeiAgGg9+NQM+GVpCPWJ6486/Idq Ghf+ImL124D1Nn0FevXylsLIUGYYutyzUZ/UHvw04NeGVi0RoW7/tUlY4AGvxgbJ/0pTNTqCv x/6GjozzvtLBpInxT1dqEx7s/woKZh8K9BqL94piMHDGTg8/9SOVT7i8sxoAnIUlflIWs3oqo NkzqfuYMcU1lUpbRQSoKxbV1HhwgtvlfKj7BS/TE6EuY2ZIugjohW4FCzrs+nU0rrnIclwn2M wUID8KACN4eosYOI73BLP9/qrYPgnhZ8ipE/7zj9pcpyZGfG1lofwlygkAZgL0XicdAeDXdGQ 0DnHTe+euRLIzJ16RsLGW3P3tqBxi7Bkoi/zplrq6n4ACNUROhJNya0DxByDeYE8nqrm9JZYh N9cc8c7JcZrMDoTfyLo8z2KN8kO7RJTsXrFu2zk+9vDcuRA/X40icTj9zci3UQ/Sq0ypLE02L siWG4nkOkKp9Fo0X/E1o0Et9/T1Un3CmCwpTMTb+jWlFJt8tTjUdu/iw9DQb1jut79npplRBP yWUaSR/DRv6B9qWcR29HIyYmItfJzB9DfWYRZf4ufZavDPr6lKWQnrIq6X6esqBRcKvDu6hUy LHl9R6QS7p1BGdNq9H6GTnQLyke1o5womdq1RWAIKnvDa6BvtigMBwUGwfNLuCbnLTxyCUYqn FiOdwK3IcfCwiuHD+LurAs1ET1BrDVoPnEQMtrNJfSiet7CfQxYdzZ8nzltBg4MyH5zLsq45A Z3hsZNhq1FFyLK9BcaExgPEN8lu7JbD1kvAEm0rUxHZwiPiRkZ9thjkPjKLLPcdmVGc88MUg8 g7MbklYPf7OzcQVcucdyCNs1dsHfULaZIQ/lc4pNTuZkndngFUR+BT4rtII2HjtmO2t+QpZvW 4vuwCDAYqtW/lH0xvTSVUTIUtBlu1VluABIF/74r9RzoEbMp3NRPxaG1I3b4HWeeg8hZbYdek JlRZrfSs8mky1xJOZrBt1g089v+JE8PGxgqL9MPydOEn7XdbNcW+/5WL4MfgLnnsealloOkkZ ifUQDoSRWh4wp4YWgEPYRVMX7/x12k+BKpptaoMT3d2KU5ynzyt5COjSsQhU= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Markus Elfring Date: Sat, 9 Nov 2019 09:13:01 +0100 Adjust jump targets so that exception handling code can be better reused at the end of this function. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/net/ethernet/freescale/fman/mac.c | 42 ++++++++++++----------- 1 file changed, 22 insertions(+), 20 deletions(-) -- 2.24.0 diff --git a/drivers/net/ethernet/freescale/fman/mac.c b/drivers/net/ethernet/freescale/fman/mac.c index e0680257532c..7fbd7cc24ede 100644 --- a/drivers/net/ethernet/freescale/fman/mac.c +++ b/drivers/net/ethernet/freescale/fman/mac.c @@ -659,16 +659,14 @@ static int mac_probe(struct platform_device *_of_dev) of_dev = of_find_device_by_node(dev_node); if (!of_dev) { dev_err(dev, "of_find_device_by_node(%pOF) failed\n", dev_node); - err = -EINVAL; - goto _return_of_node_put; + goto _e_inval_put_node; } /* Get the FMan cell-index */ err = of_property_read_u32(dev_node, "cell-index", &val); if (err) { dev_err(dev, "failed to read cell-index for %pOF\n", dev_node); - err = -EINVAL; - goto _put_device; + goto _e_inval_put_device; } /* cell-index 0 => FMan id 1 */ fman_id = (u8)(val + 1); @@ -717,8 +715,7 @@ static int mac_probe(struct platform_device *_of_dev) err = of_property_read_u32(mac_node, "cell-index", &val); if (err) { dev_err(dev, "failed to read cell-index for %pOF\n", mac_node); - err = -EINVAL; - goto _put_parent_device; + goto _e_inval_put_parent_device; } priv->cell_index = (u8)val; @@ -726,8 +723,7 @@ static int mac_probe(struct platform_device *_of_dev) mac_addr = of_get_mac_address(mac_node); if (IS_ERR(mac_addr)) { dev_err(dev, "of_get_mac_address(%pOF) failed\n", mac_node); - err = -EINVAL; - goto _put_parent_device; + goto _e_inval_put_parent_device; } ether_addr_copy(mac_dev->addr, mac_addr); @@ -743,8 +739,7 @@ static int mac_probe(struct platform_device *_of_dev) if (nph != ARRAY_SIZE(mac_dev->port)) { dev_err(dev, "Not supported number of fman-ports handles of mac node %pOF from device tree\n", mac_node); - err = -EINVAL; - goto _put_parent_device; + goto _e_inval_put_parent_device; } for (i = 0; i < ARRAY_SIZE(mac_dev->port); i++) { @@ -753,24 +748,21 @@ static int mac_probe(struct platform_device *_of_dev) if (!dev_node) { dev_err(dev, "of_parse_phandle(%pOF, fsl,fman-ports) failed\n", mac_node); - err = -EINVAL; - goto _return_of_node_put; + goto _e_inval_put_node; } of_dev = of_find_device_by_node(dev_node); if (!of_dev) { dev_err(dev, "of_find_device_by_node(%pOF) failed\n", dev_node); - err = -EINVAL; - goto _return_of_node_put; + goto _e_inval_put_node; } mac_dev->port[i] = fman_port_bind(&of_dev->dev); if (!mac_dev->port[i]) { dev_err(dev, "dev_get_drvdata(%pOF) failed\n", dev_node); - err = -EINVAL; - goto _put_device; + goto _e_inval_put_device; } of_node_put(dev_node); } @@ -821,8 +813,7 @@ static int mac_probe(struct platform_device *_of_dev) phy = of_phy_find_device(mac_dev->phy_node); if (!phy) { err = -EINVAL; - of_node_put(mac_dev->phy_node); - goto _return_of_get_parent; + goto _put_phy_node; } priv->fixed_link->link = phy->link; @@ -837,8 +828,7 @@ static int mac_probe(struct platform_device *_of_dev) err = mac_dev->init(mac_dev); if (err < 0) { dev_err(dev, "mac_dev->init() = %d\n", err); - of_node_put(mac_dev->phy_node); - goto _return_of_get_parent; + goto _put_phy_node; } /* pause frame autonegotiation enabled */ @@ -866,10 +856,22 @@ static int mac_probe(struct platform_device *_of_dev) goto _return; +_put_phy_node: + of_node_put(mac_dev->phy_node); + goto _return_of_get_parent; + +_e_inval_put_node: + err = -EINVAL; + goto _return_of_node_put; + +_e_inval_put_parent_device: + err = -EINVAL; _put_parent_device: put_device(&of_dev->dev); goto _return_of_get_parent; +_e_inval_put_device: + err = -EINVAL; _put_device: put_device(&of_dev->dev); _return_of_node_put: From patchwork Sat Nov 9 09:06:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Elfring X-Patchwork-Id: 1192388 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=web.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=web.de header.i=@web.de header.b="Iw40WaYp"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 479B8B0Ch9z9sPL for ; Sat, 9 Nov 2019 20:06:18 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726559AbfKIJGN (ORCPT ); Sat, 9 Nov 2019 04:06:13 -0500 Received: from mout.web.de ([212.227.15.4]:60183 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726136AbfKIJGN (ORCPT ); Sat, 9 Nov 2019 04:06:13 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1573290365; bh=HJqqvOPiLrBZhZlGpdiUIZoAA6i9aylcFpOm0pxa0y4=; h=X-UI-Sender-Class:Subject:From:To:Cc:References:Date:In-Reply-To; b=Iw40WaYpq+WCmGktF6ar3LpEFcdcS+VItZXzCAJUVpmQQXMALz11LOan9VIG5M2Sv LMZgB6syYfvypKUU5+o01/pah7MC4SgrH3pdlX1z3t904rOpppfOJa6P0cq3OtnzeB sIDbS/P7wHzm1OzN+6/ZaTVHhXyzwJCZwPijPHw8= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from [192.168.1.2] ([2.243.82.67]) by smtp.web.de (mrweb002 [213.165.67.108]) with ESMTPSA (Nemesis) id 0MCZTG-1ibePu3Pms-009NIN; Sat, 09 Nov 2019 10:06:04 +0100 Subject: [PATCH 3/3] fsl/fman: Return directly after a failed devm_kzalloc() in mac_probe() From: Markus Elfring To: netdev@vger.kernel.org, "David S. Miller" , Madalin Bucur Cc: LKML , kernel-janitors@vger.kernel.org References: <132e8369-c4da-249f-76b8-834e394dc6d5@web.de> Autocrypt: addr=Markus.Elfring@web.de; prefer-encrypt=mutual; keydata= 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 FEE= Message-ID: <8ffc16a2-62cc-f948-e11b-55bae1d6aae4@web.de> Date: Sat, 9 Nov 2019 10:06:03 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.1 MIME-Version: 1.0 In-Reply-To: <132e8369-c4da-249f-76b8-834e394dc6d5@web.de> Content-Language: en-US X-Provags-ID: V03:K1:eLIXJeDSxsn/QQdSB2uFUJVZ6LS8AYKedpK+I/+HDllWZmjgIqu MgBFt51wz25TKWTP5yGGAfPt7QWFjXSY4qx6MICNpkBW6vuVjiveWVJhw+whrVDsk9hnjWL pJpxX+iHNhak5SaYci5QxoKzL37Q08VcvxVh8tL5oh4kEM4YJaWtjTaEmyA5/7OvRS/WS9e PTsVi/3VLXDugPOJ39Ngw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:ZMs4svgeo8Q=:JeiHgeqUkIyjqk+cjSLHik P8w1zMdyPDHMLh/ysyUhA6Bgui8xDi1fvzHHS4hLT7CqoHsKxCDyGTUftVVjFJtWnF8G9hdP8 7MVv5zvkArClvN75IP4t+rw5Y1bE+eclxqDdeExiN+XFvCJHLCxyrjlUaiCgDdsSV/s7r0T3J vnf7GugR2Yeamx2Uo784CtZgsTMd8k9EIAYEZTgLaYN0/LFtJaxKvg/24l/kOnSzsB8/0fkzZ +5BFRWI7mK14MfiFhjfaMAp5QHvoVhNYPKxcWCKmpVE8mfPReGY3dV1rxenfbWvMhG4I7iVSc NG/CDzMhhnIrKDNlLOnmNmnpcbMu4JHFEgP4D+MWOxReSd0QcItDUyxXglpr2zTp6jK5hfxpo nbAE2aiDr5EEKrKLTpwD0530AiAawqZPJwsta7PPDfelO+S20CIkx3tFsPWbr+rBNtFY06gSA LrPQBHhD4vn9soc0Eyl77sV2gLXlCncaKLcqWsi3chCHqEQJol/ilvMGUuRjN2DGN4hd/h9DU PgqUjogKdzOJKE6dM160vkuFrt2ElSCvWlr8aiwTMyq0MW7+5sKBPdePFR9zo4PGY4brSWtHt V5yMvqkdlTwB55BBNRUu4ex4JxfKt0t+xL6RRwb2CdDOGydkMxFH9Qa4WGesz9FkVeABFAPCR nyCacuqbmW8ZCUbGNEHD8CNEvXfHjRPMVBbNK7eFXCGc0iU9omYY8dauBlNwSxAzIJ73PhANo 1rDoNORchiTFtv0KHVM+0yK/8rgiUPS4Gsmi92cMc8bI0/bi2PZfnSIKxqhcaJtiyTJKjhqtS KPqDVzcmzVcGvbpAECBe89UTrxhIbtDI3zuUl52TS1SWE9KDbgxQZBvFGcVvguWz31+aIRyzi r1XSPZMy4rq+QHN7/MtlqhxlQ/9cnOsZQYXTd34nGvnNuxH2iZS0ewzppZOkekEakibBKOZXP wVD+xJn3U/yR/uRP25XvXiFqUeiErCxXDgazvLTdghZGi8AfJ+YuKMO/Yy4zVcUSVl2kz1uiG rNhX6m4rTt2mchmqli7tzfV1whPwEHa2cu+FxhHm6lIaqsBlt55jo+2Knpmx6ZrDCW57vYoVb NpV6nzX35i9Ttt799i+8FACwH/o9CLZ3tP9MzaWJ2cENq2VB4HsuhixW1Bt+FDaT6q4ihdnHi BMf5G7D52Bd4u2VlmpfBu0eH3cIsDDKbZQDqQUrtd7RC7/LNmjfGPEFfz/05tUtp8IHUgLN8X geMewjKppsR6/nQM3EtaCnU0pVuC6FGtCcuCkTOZ1Cqy8wpvBIBj78oqmbyc= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Markus Elfring Date: Sat, 9 Nov 2019 09:26:12 +0100 Return directly after a call of the function “devm_kzalloc” failed at the beginning. Signed-off-by: Markus Elfring --- drivers/net/ethernet/freescale/fman/mac.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) -- 2.24.0 diff --git a/drivers/net/ethernet/freescale/fman/mac.c b/drivers/net/ethernet/freescale/fman/mac.c index 7fbd7cc24ede..75614e2ebda3 100644 --- a/drivers/net/ethernet/freescale/fman/mac.c +++ b/drivers/net/ethernet/freescale/fman/mac.c @@ -614,15 +614,12 @@ static int mac_probe(struct platform_device *_of_dev) mac_node = dev->of_node; mac_dev = devm_kzalloc(dev, sizeof(*mac_dev), GFP_KERNEL); - if (!mac_dev) { - err = -ENOMEM; - goto _return; - } + if (!mac_dev) + return -ENOMEM; + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); - if (!priv) { - err = -ENOMEM; - goto _return; - } + if (!priv) + return -ENOMEM; /* Save private information */ mac_dev->priv = priv;