Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Sean Anderson <sean.anderson@seco.com>
To:     "David S . Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        Madalin Bucur <madalin.bucur@nxp.com>, netdev@vger.kernel.org
Cc:     Paolo Abeni <pabeni@redhat.com>,
        Eric Dumazet <edumazet@google.com>,
        linux-arm-kernel@lists.infradead.org,
        Russell King <linux@armlinux.org.uk>,
        linux-kernel@vger.kernel.org,
        Sean Anderson <sean.anderson@seco.com>
Subject: [PATCH net-next v3 33/47] net: fman: Clean up error handling
Date:   Fri, 15 Jul 2022 17:59:40 -0400
Message-Id: <20220715215954.1449214-34-sean.anderson@seco.com>
In-Reply-To: <20220715215954.1449214-1-sean.anderson@seco.com>
References: <20220715215954.1449214-1-sean.anderson@seco.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?X3ud3n1PUIDTo+ILvitoh2PYJLXxONCse6OFjfpnpgt49T3UtFwH9iceQWmn?=
 =?us-ascii?Q?GlLwPgnwnVqCe+rNx9n5TqbWjpO0rXawBxevboRuFChb5S9lnENhIcdPmQP9?=
 =?us-ascii?Q?NWR4oPwwImJIXsFY6ikBe/5fW39XXMUCD8lcMmpIl/YJ4IPSLie7/W9/sYeC?=
 =?us-ascii?Q?/RgtbugFzJrUVRRMjhLZISrhdF02Bi9C575FnUYsxlPdzP8IzWHzrUfFQZ+h?=
 =?us-ascii?Q?DiHn0oEFHqZei5EQrfV4LlFV0+v1TbYe67MabUBJfu3LcEdWCXhzh6E1CUn1?=
 =?us-ascii?Q?/XSV2M+eWVneNPXfbQmgIP4N9lJCgUUFQDQy2RlMaHr6ebv2uqYoyUPY2+Hz?=
 =?us-ascii?Q?vKUT6+08Im0g2YhetW7HH6WA0srf70uDR3wBQ/h9iQElSvbvGEogEicksIZX?=
 =?us-ascii?Q?9Px8mqFoNxoBrBl257LDfzDyZXhhBUiqoIV2GPHZDSSdV5JID7MnCZxKIE8o?=
 =?us-ascii?Q?CIKJ15JVQQYunv9kPQqLUjul+QImHFManjlKelYvCCFH91J+bWrpxcOW5WIE?=
 =?us-ascii?Q?EKDkOG+aCMXREzrZlZnO0EbV/twJY3np2U34FNUIaAsWqpZfgwnrgqAABYvM?=
 =?us-ascii?Q?Dcxst6rvQ2nfJe5anm5Hj6Wf3UbQmIRNwlYz3Dz7OlKhROTa/lUxMG799ugi?=
 =?us-ascii?Q?SFnyHOrb74Zv3jnY50ofD/cIvpZQ8kaSfkR4f0g7UELMuJhfk+93AQUPgpNR?=
 =?us-ascii?Q?v1vxvbRxk4fAo1xoxMqCNfAmMZmfgMFeHJ8uNENLonSlvlZvYnabtb4h0IGz?=
 =?us-ascii?Q?ITIUCUtAO4jcTKQ0xdxl0oXbUJPGWHUtd0eAeifYD9gVMZTPNZdJ9HQk94qN?=
 =?us-ascii?Q?tJdKmVKVJ7tQyOhJkEkOJHhFxdXu/b/PGkYko2wrQmypIhH4DlDfwKfYheHo?=
 =?us-ascii?Q?q1Y/81KZc/utBx9tc3Hac/p+b/JSN8Wp1kvzOg+UQym63YeQSAAqyk17saBM?=
 =?us-ascii?Q?o0/1t2z3EOM160Mv0wVUYTtXCR1UNrQPYZEIT55ubY1Gs146Uaos5e3O2pfo?=
 =?us-ascii?Q?wEdmy6PzMSGo0aiBtU6i4xnyUcnVCHcdPHiDGkw7DKdtVrkAMIks+Y8raZo1?=
 =?us-ascii?Q?BSMI7T14Wi56o61/99U3NmbVxUSGu55n14goS8TsmlvDBrvMuroIdRcUsyB2?=
 =?us-ascii?Q?vTS+4iDe3MssYG+YVIuQpg8Sf9JyJIvScUF8kfHjM/pH1qrlmpDfFhxGFEqH?=
 =?us-ascii?Q?NPFbdiWpm8bX41pX2e1uWcdHg1qWYEAx9+J+3KIwMKYl8Hrj9vKgvEMtBzMB?=
 =?us-ascii?Q?VbEP6/gWQkbgY8y6oc0hl1U/2tzwJbajlNF3574yX2+iFf1OpTlUNxYnyDNt?=
 =?us-ascii?Q?W2iOBdV9QBn2FN2AFHmZrU1o0cZ3BNJk4oIK9+8NAzag4zert+spd3CVnPNz?=
 =?us-ascii?Q?rvrwXHrV2P6V6DqoK8Bp+JP4PQvTSixucU1v+gp/0V0rAYLuqe4GIVQOKVEi?=
 =?us-ascii?Q?QRmaeQOsC77i/A1inQFydY0htOLWU5cqDVFQue47EVXWC5eyGO7out+I9oVu?=
 =?us-ascii?Q?N5d1gHjPBmwh9oF4QabbtVbiLkv/bx555qMyvSX/ZWY9JxkYZv2mCA2+pKm3?=
 =?us-ascii?Q?MsAkEXywy/g5N95+OkpWSA8MVZEvhoziB0kTgduy2/ZWzS93Y+giGLRlefi7?=
 =?us-ascii?Q?nA=3D=3D?=
X-OriginatorOrg: seco.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 48241f1c-f73b-40b8-3653-08da66ad90f6
X-MS-Exchange-CrossTenant-AuthSource: VI1PR03MB4973.eurprd03.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jul 2022 22:01:27.5026
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: IAnovIGUtPphlR1aTEmEkg2Qeygp+JUNWqun8WWyigdB18IMCmNzqbbLv7LuhNhUWo0u6+QNfQ0y3/XN4M0DGw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR03MB2902
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

This removes the _return label, since something like

	err = -EFOO;
	goto _return;

can be replaced by the briefer

	return -EFOO;

Additionally, this skips going to _return_of_node_put when dev_node has
already been put (preventing a double put).

Signed-off-by: Sean Anderson <sean.anderson@seco.com>
---

(no changes since v1)

 drivers/net/ethernet/freescale/fman/mac.c | 43 ++++++++---------------
 1 file changed, 15 insertions(+), 28 deletions(-)

diff --git a/drivers/net/ethernet/freescale/fman/mac.c b/drivers/net/ethernet/freescale/fman/mac.c
index 66a3742a862b..7b7526fd7da3 100644
--- a/drivers/net/ethernet/freescale/fman/mac.c
+++ b/drivers/net/ethernet/freescale/fman/mac.c
@@ -291,15 +291,11 @@ static int mac_probe(struct platform_device *_of_dev)
 	init = of_device_get_match_data(dev);
 
 	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;
@@ -312,8 +308,7 @@ static int mac_probe(struct platform_device *_of_dev)
 	if (!dev_node) {
 		dev_err(dev, "of_get_parent(%pOF) failed\n",
 			mac_node);
-		err = -EINVAL;
-		goto _return_of_node_put;
+		return -EINVAL;
 	}
 
 	of_dev = of_find_device_by_node(dev_node);
@@ -352,28 +347,24 @@ static int mac_probe(struct platform_device *_of_dev)
 	err = devm_request_resource(dev, fman_get_mem_region(priv->fman), res);
 	if (err) {
 		dev_err_probe(dev, err, "could not request resource\n");
-		goto _return_of_node_put;
+		return err;
 	}
 
 	mac_dev->vaddr = devm_ioremap(dev, res->start, resource_size(res));
 	if (!mac_dev->vaddr) {
 		dev_err(dev, "devm_ioremap() failed\n");
-		err = -EIO;
-		goto _return_of_node_put;
+		return -EIO;
 	}
 	mac_dev->vaddr_end = mac_dev->vaddr + resource_size(res);
 
-	if (!of_device_is_available(mac_node)) {
-		err = -ENODEV;
-		goto _return_of_node_put;
-	}
+	if (!of_device_is_available(mac_node))
+		return -ENODEV;
 
 	/* Get the cell-index */
 	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 _return_of_node_put;
+		return -EINVAL;
 	}
 	priv->cell_index = (u8)val;
 
@@ -387,15 +378,13 @@ static int mac_probe(struct platform_device *_of_dev)
 	if (unlikely(nph < 0)) {
 		dev_err(dev, "of_count_phandle_with_args(%pOF, fsl,fman-ports) failed\n",
 			mac_node);
-		err = nph;
-		goto _return_of_node_put;
+		return nph;
 	}
 
 	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_node_put;
+		return -EINVAL;
 	}
 
 	for (i = 0; i < ARRAY_SIZE(mac_dev->port); i++) {
@@ -404,8 +393,7 @@ 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;
+			return -EINVAL;
 		}
 
 		of_dev = of_find_device_by_node(dev_node);
@@ -465,7 +453,7 @@ static int mac_probe(struct platform_device *_of_dev)
 	if (err < 0) {
 		dev_err(dev, "mac_dev->init() = %d\n", err);
 		of_node_put(mac_dev->phy_node);
-		goto _return_of_node_put;
+		return err;
 	}
 
 	/* pause frame autonegotiation enabled */
@@ -492,11 +480,10 @@ static int mac_probe(struct platform_device *_of_dev)
 		priv->eth_dev = NULL;
 	}
 
-	goto _return;
+	return err;
 
 _return_of_node_put:
 	of_node_put(dev_node);
-_return:
 	return err;
 }
 
-- 
2.35.1.1320.gc452695387.dirty