From patchwork Tue Jun 28 22:13:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 12899101 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 89AFAC43334 for ; Tue, 28 Jun 2022 22:43:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=G5AUaWal3yq9uycaCrGyI89/RzwPYqIC9uuUnC0zP8M=; b=ECSmlPdlrCX7IR 7FFyLgw6tYLe+hFGYh3xam3jwmKlkPpibldn1mE2QQ9Bvh0g4rYJi3OQ/iStwTSQzgkfD/CNMYTBm UFB3QB1uUZVXLdeJkq5BJZLiYjPpbhnDQkev+Bw8QIRM9XI9I/9F0Xqt16DGChJKcbEH5nCmNgR1M wi6ouufNcNrrBMo5LUN1hty6LURbaRIgR2vWOw+7/E7mQav7Nxc6xXrcHeYqYikDuMJkD1/YRAxEw wZWfvS09Ti1EnitVEgesogXmwcKXEp4/p5qG4cqSTsW110m93Mn3CXU3BarMov+GT/JXHJmcaOw5X Argtva2fvOvzetgwhkcQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o6Jts-008Tv9-2w; Tue, 28 Jun 2022 22:41:42 +0000 Received: from mail-eopbgr00086.outbound.protection.outlook.com ([40.107.0.86] helo=EUR02-AM5-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o6JUC-008MrJ-EM for linux-arm-kernel@lists.infradead.org; Tue, 28 Jun 2022 22:15:14 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TFuq4Jn99nKyf5Cmbjur73WrOicv88pI/IULRa71B/BcnIDsf4zgkmK+T+tKPlZB2buzXhL+vtzd0JS4FdFF5F/8u7AVBp5Qa/91lhw3OlROtQBX/CfP34/VEu/u2uwlQxzm4RigpCts0LHbOPzuDuZwDNm3fmZ4QjhF4k6Cb70pBTnwaMGYSMeoCdDtvhIY4M7jvgFXCRVzOXTI5HFc8SfTYTNFtPkf+rnLRAxmnocqZQd5YW8jz7BvPuAp3w63XUSqGFJlpt51mzmCsesQUhuRMHE4WzIBuKotiJ7L9kSwuRJcnPHF7aI3YCBUoHAqlKxzyWajAX0jIaoQfeouWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=t6F6kJr389oREnPSKtMqwsCZtWk3wAG2vXWfopMgx64=; b=EhgYznS9dDZKA2An13/L7mcBdo+dxu1YzugBcRKGTzm0RcPxmOSsd+xUaHIUaeE3Myf7oxK24BN32TbdAy5N6+sv0+F6pqAybWIvGs8bGSjg1LyTdhLY8r/aH/8bUq627NXqeZVJLP+/2KiZjpGhPmU4T/LDQSlecheEGiJDJCbcs+JjpG4sB2UHCZ1YWtm0soRwpb21pE3GwifxV3jz+OToI9ftiqxyj7igjsSgh+9pOJyXDbsYBI8khf1sjQ5+XyHC5+NWjd650oun8tvccOrjAxvBTLonZx0lwOc2aO0hLCWC2yc9N7x6k7V5624C+SzSLm95EZMqAm8t9yZtiA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=seco.com; dmarc=pass action=none header.from=seco.com; dkim=pass header.d=seco.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=seco.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=t6F6kJr389oREnPSKtMqwsCZtWk3wAG2vXWfopMgx64=; b=BidmpD+gSDDZCvObghMndCHfUrc4EorHLFqhGhnhJujh9Q9qr99/M2EVxkFqFJz4gJxFOyd0xSnBbZzsmKLGLJHEQ0dyo7hm74M5IkihB98hNqOuia3k3BS+mM5pp4e6HcKslu4+hrdFBna753selT12xaHvQcXpkRqsZOMSIGXCK0KMuHpYkaZ3z8TB0b5Kj/4nXcO/bXUvJguaGngsAnPL0tACcE7LuIFV8fQo0kmAAttXiMCEMEghh7Zo8IzeFrtLQpqijPlFRkd2q+GbuTx7QyGBB7gJO9WzTF3t0u+sBvUtgaWXEd/KFcDTVERlD7425PnyaUoKxFPWWOSQJA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=seco.com; Received: from DB7PR03MB4972.eurprd03.prod.outlook.com (2603:10a6:10:7d::22) by DB6PR03MB3013.eurprd03.prod.outlook.com (2603:10a6:6:3c::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.18; Tue, 28 Jun 2022 22:14:55 +0000 Received: from DB7PR03MB4972.eurprd03.prod.outlook.com ([fe80::757e:b75f:3449:45b1]) by DB7PR03MB4972.eurprd03.prod.outlook.com ([fe80::757e:b75f:3449:45b1%6]) with mapi id 15.20.5373.018; Tue, 28 Jun 2022 22:14:54 +0000 From: Sean Anderson To: "David S . Miller" , Jakub Kicinski , Madalin Bucur , netdev@vger.kernel.org Cc: Russell King , Paolo Abeni , linux-arm-kernel@lists.infradead.org, Eric Dumazet , linux-kernel@vger.kernel.org, Sean Anderson Subject: [PATCH net-next v2 23/35] net: fman: Clean up error handling Date: Tue, 28 Jun 2022 18:13:52 -0400 Message-Id: <20220628221404.1444200-24-sean.anderson@seco.com> X-Mailer: git-send-email 2.35.1.1320.gc452695387.dirty In-Reply-To: <20220628221404.1444200-1-sean.anderson@seco.com> References: <20220628221404.1444200-1-sean.anderson@seco.com> X-ClientProxiedBy: BL1P222CA0011.NAMP222.PROD.OUTLOOK.COM (2603:10b6:208:2c7::16) To DB7PR03MB4972.eurprd03.prod.outlook.com (2603:10a6:10:7d::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 40525e28-6bb8-4004-359c-08da5953a135 X-MS-TrafficTypeDiagnostic: DB6PR03MB3013:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 78qwrstOVu44Tf1X18w59fUtPct+QyghECNMH58SNrO5jP0vQ1zd7gbZ1whRXhkl19QucgSWiAyQJAkn9nh5kTVyucODewUKd7ZbmeV4hD0Lhp1C04OYShfK1y89ivRnFkbzUHCev403q0fvTCGHgZOu/ylcSTVSACQys0pCkWHcvcKoemkFJK7tPAeZRHKNQdcs4vwDWkN2brAkRjXpVSJx5Du3Tu+9oUDXFB791UEaySYYKVejcaYb708ehz/HtMy1ocFQMdNNSvd3xPofoiTYY0yO3tYjfH4y7TcTquys5skqt31j0KQH7o29zHu8HC2nevm0R4fD010CjoVgVZWh6ibMY+2uu0CZugRSbduNbBbzDV0YOYd904i3A3pfVTGEV8oLiz9Ubnq/5ClhVdpmB2iEU3ZosrzDGaXicR0/71IF8j3OZcTq/Bukxn57BSlCQEerws2xRkixfFVOz/CHZ1T2jU5oG/vll5UoW6vpjBYX/5tuAxOfIqUZMkanGX0R/8HqZK3E/r3Rd3I88Dmx+XvEhSk9FqeGBqW5p40V0Bd7qZfxcmivnsGFNX2nFFm7+716Im9lyLeubS/7gJZ1IeH7ZCKrkuPKSMAQJlMF6ruOc/9SmHRE3iXiA8ennRhKZU0xCiq3QsKmmHdsQXFlrYCvSLoUB5VZUada/Z6rF4pSLCvikUxXz7PQ2SpSHsCtkjhkyVcVhWRLgY4noHKyuYqQPyVVQYp4pVPI+Krcf6S3HTXZ2nyN0vbyHh+7sn6t2S/zCZBan38DG5zM2jamfwHobRn+wv1PMr2LJ10= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DB7PR03MB4972.eurprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(396003)(39850400004)(376002)(366004)(136003)(346002)(2616005)(41300700001)(26005)(107886003)(1076003)(66946007)(8676002)(6506007)(6512007)(52116002)(186003)(38350700002)(83380400001)(44832011)(6486002)(8936002)(66476007)(38100700002)(2906002)(66556008)(86362001)(5660300002)(54906003)(36756003)(110136005)(4326008)(316002)(478600001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: /OGx9e/UbdYdm0bqg/Ei5l3MRoQvxE8l9qXEAjMbCjcB7pGKc5GG6lQ0xj0kCsRUUdrpSawnh/FcybhjpTKz+ZAdAJg0yOE9hFHRSGSgRcR6IYVLLAR9IaNc+Fn0eeoaPdljmNOGpOzlZ+VjHKvWPbc0aza/EW3tDrt6gKjQfGfGo5xajPo4npeKNdJVIRnFwqMjvXpII3Op9GPzuygwIIbRRB2bTOM0kE5zPoEK3wM63Sf5zC3pzZdQ85c8xBM97RJyXXadqkaJWbb2EjH06UmUlGDTI0BvmK3PjE9Xt1kQh7rGTtQva+SHw7H+uuk/f9ZOSvihij6cWLr+1PGlCUxSaR7NYv0iCRgvqLxz8zpJtrMAFHp0uR2x8N3FsgIs8rkzZtPRDSrHJ8BCo1LVKcE1GVliRjMOO0eK0Anzf8zVkkPc4rHMl/5oBlRXPBIgbhSWdZYeVllgq6u3DLuCIxke6GDUxKPX8SX1lKRWgWUXaQpO4yaNi02Cfi+v6as38SQT3T7eCSH/s0M1pwT/kgVnI7eU2Fr8dYBR+F8A4Fu2I20sGIc0CHrOxBzZy6ba8Y8gLqm4VPxh1sDzifLihJtSSs0gLrtI7kt9j7BTMNfCJLqXsVtpJywLDQEV1e6BC3Irj+Ht3UWPyVjX6NSGyN3OK0x5/CFMpQl7obWTubraRkGGJSZJxXAAUwrzHo4d6myhbQDmY42g6/4b+PnvmzkgIXtcExSWtADSEoFw9I+kPB4+ckY6yM/wInCL2VVrejCRqGCiejWS/iGGcyBuwzZVpTLfuZb7DOI8osMjUzo74hI8gXQKQZwWtLZLKbReeL2KtNrGQw8idMh4oitpXO3JGl9UMgOZ2GTvkF5tnETioWOZdGUlfVU8dqLuAvR4zh3kld1nBdXkjwU8Wbs44rwa+nGI1rcp+FVQt3tzGfHV6Y+1ZZMak1vXUt2U8m5QWK2F9xzfqcRsdko06Af9mlYVtbaE+65F183iJUhnbz1+XbTrz5yzaGa+p6zuFjVB5Ie64EZ7Lo5vtEHXZ8WFOJ29WMuxe9HbLeJyAR4H0UD1EhCau56U2IakuFNNVSw28ELyoK/0PldJlroUsMfy1cjkKwwdmnl7w7E93q32obReDZ187wZGZtD7pT0osG9c+psUqk8ZmncXpdXtRcGKYDsLvd4Zd2b61Bra8siTRo3+4trzNNTbiv5jDgESbZ+45xL4MqsphcAevZqgD4ilPAGQXDfTdX4xozfnD7wotBDS1WnnMMlB749wIGTtTBTD8su4FrgmgdwPNFkYSsfHNgRms+rJxsVpUpgCpkzDQ/lcKo8CHXXFy3+vFpYiFL8F2Qeo1G5cMf0odEqRar/q8lHf6kdIoiMUsp9DAT87oD7T1FiRup1Yg9pgqZoNM+1W8Sfr1MpEw7kd9mwbKoOXLMqpVGy23GDQ0Du7i16dqAkmv2lrmdWBtOTsBLTyP5/lOUOBI71ElBqVh+5fbZZ5Z9wGwwhNmri15dC4iKhMj9q3ECoJ3/6pAFfZwmrSrbUlrpII13J+3RE0UFC7qItWZ4Lw94flCtTu3d8NNjR6WOJVZywOCKl/YL46a6735jgqHr5JZ3L4L5rE0r4QJ214tw== X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 40525e28-6bb8-4004-359c-08da5953a135 X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4972.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jun 2022 22:14:54.9060 (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: jrGaG26RZE3FT+11rgDLEWcWomxpZ6RqD0ZndZrD1obIaOhqNdMn4OKYxtybl3Brl1at3iygJZutb2R2R0ixVg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR03MB3013 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220628_151508_568497_E0EFE962 X-CRM114-Status: GOOD ( 14.25 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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 --- (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; }