Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2;
Message-ID: <83b0921a-5718-4dbf-b9bd-5662e47e3807@intel.com>
Date:   Mon, 6 Nov 2023 11:02:27 +0100
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH] net: bcmasp: Use common error handling code in
 bcmasp_probe()
Content-Language: en-US
To:     Markus Elfring <Markus.Elfring@web.de>,
        Julia Lawall <Julia.Lawall@inria.fr>,
        "David S. Miller" <davem@davemloft.net>,
        "Eric Dumazet" <edumazet@google.com>,
        Florian Fainelli <florian.fainelli@broadcom.com>,
        Jakub Kicinski <kuba@kernel.org>,
        "Justin Chen" <justin.chen@broadcom.com>,
        Paolo Abeni <pabeni@redhat.com>,
        <bcm-kernel-feedback-list@broadcom.com>, <netdev@vger.kernel.org>,
        <kernel-janitors@vger.kernel.org>
CC:     <cocci@inria.fr>, LKML <linux-kernel@vger.kernel.org>
References: <0b2972cb-03b2-40c7-a728-6ebe2512637f@web.de>
From:   Wojciech Drewek <wojciech.drewek@intel.com>
In-Reply-To: <0b2972cb-03b2-40c7-a728-6ebe2512637f@web.de>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?SHovTXI0d1NnSDNhYUtGRzZRM2xKWVkza0hZZlhVQ0c2ZXhDZFE2SW9vVlNH?=
 =?utf-8?B?Ny9ESmdwWFhUZCtnb2pRMDdvZi9HNHBBVVJVMGJWUkJLK0x3OEswY1ltcXJi?=
 =?utf-8?B?eDFkRmFOSDhYZzBWMTRHeFhMd3lQMmxzamdsS0VrYng3ZXF3NVd5ekx1NXBi?=
 =?utf-8?B?cE11NU9NMUphNWF4Kzg0UnU5SG1INC8wcElkL3RZRlRCdHNHRTNUSkhDTmNQ?=
 =?utf-8?B?OExucVp6S2JQMjdyTDh1dGVxRXFKcUtuODNVYXQ5U3NtOGpUZllEeXBBVVcw?=
 =?utf-8?B?QWdWRThPUDE2R01oWUo1OWNyVW5CRURBWmtONC82WTNHcU9xTkRkbkpSVVVT?=
 =?utf-8?B?VDEzYlIwMUJEcTExVlo3Um01cTVsZGEraEgyVDFFMGdkNUVHUkpOMFRGUnE5?=
 =?utf-8?B?TzNhenBwNXM3YXJpVmJ5SUZzM3l4T2hVSEg4WEV2d2l4bVZtdzArRHR3UkF2?=
 =?utf-8?B?ajJQVmtDVnZqZHRNMkhVZzZxckxQZENVMnE4dFd5bXpEemw5Y3pvQnJobXFW?=
 =?utf-8?B?MHdVUUtpTWFXZDAvZ1B6VXRhQ0U2NWEwcWZLeC8ySGkxbzB5enFzbWFEcGxn?=
 =?utf-8?B?ejA5WEtQUG41UEZLN3RrOFZwY202NU5RanUwU3BSazNnR0JzZHBiRkVGQnd6?=
 =?utf-8?B?MkdNaEpiZFdiZmtqb21RNzh2YU1XN2tXTm9vVGM3T0w0a3VqR1hCcXhMaGR4?=
 =?utf-8?B?OVhhVjdKaFRwc09QaGZWMXg5djYyYTQ4Zko3K0VONkhOck9Ob2pSdHNzdGEy?=
 =?utf-8?B?enplSitQbmU4M3IrWDZPL2dtNGNXZlhXejlBclVzZ2VSN01JRFYxUExsb3Nk?=
 =?utf-8?B?VGFXQVJpTmpYUE4zd2xydnVURFFIdEEwYllHK1pmMk9ZeDlDME9lSTdwc2xS?=
 =?utf-8?B?L0Mzem5RTUgreFkyeUs1V3ROZU5idm9wSGVpMW4xNHNOZUh0dmwweWFkVmZE?=
 =?utf-8?B?MVNQMkVYRkF2a2h0L01jRml6bGpSZnZpRXgvWlI3UmRibVhUK2MvTGZBV0VN?=
 =?utf-8?B?OEt4bXBVZ1ZpUHk1MFdmQzZEYnh4VmFUcjJPYVR6S1EyTDdHTkxtRmRGa1RW?=
 =?utf-8?B?MVprdDcrK1ZyNXBQTlZhN2ZoTlZPZ3dkYjRBVmlrRXJqbE9zSHlBeUNTRml0?=
 =?utf-8?B?eWxmbWZlNVRuRS9Tc0ZkSzRVOXQxaFloSjQwdWlxb1NTQ0g3VGZTMFdPTHFW?=
 =?utf-8?B?a0I3Um01RmlwWU9hd0VjRk5tbFR6blZ3aGU1aEROOTg0a0dwSHo1RUs3bWQz?=
 =?utf-8?B?NDA1bjBjaS9ZQTV4dVdzdFdzWVoyWHJwSVdiaWE4WHJ4REs5M0d6RmpHZ1Yy?=
 =?utf-8?B?OVhEYmlQczcxMG9EZ0pSZ0xNUmJWL2tCUncrUXdpRCt5NzlOcDA3bDFkNzBw?=
 =?utf-8?B?TmJ3STF1MFZqbVJ3T3dadzA3bUNjbUFvbnMzL281U1kwNkJNbnc0TGhSRk1F?=
 =?utf-8?B?NE4xMXM4bHBuQmkveVJXcnlYQUdjOWRSUHplNUtvR05xUHIrajlqSGxPenZR?=
 =?utf-8?B?N3A3YjFmT0xub2M0bG5IS1c0OVJ3L1lwTmRUcDNVVkNXQVdnM3lDdEhEelRH?=
 =?utf-8?B?a1BpQjlvamNaZG1nd3Q1Ti9tWmRkRTRTSndZUGVTV243NlFHYkhkd1ZaQ0My?=
 =?utf-8?B?SjU1UkY5RmZtNWs1MHBSdVhmUlVNMFhEQ1hZaTY4dTJWZVhCSmRBdEJvR0pM?=
 =?utf-8?B?Rk92ck4zcEcrWDk4b01DSzZOekJlTkhNdDZvZC9BclpKQ3lOdW5pMXc2K3Uz?=
 =?utf-8?B?cTZUdG1iTDhtdEhpSnlJMzRzZXYvc0FKME4vVytNR3UxU01CekNFU0NuVDNq?=
 =?utf-8?B?Y2tlS0NLNFNOQjU1RngyTzdvY0tDSlZrQ2cvR2F2QzdBMlNTRnBIaUEzSFlT?=
 =?utf-8?B?ZldnSlo4UUc4TGZLRzVHTlRTTncxNVpoWE9McjNyNXRIT1ltNXlBSzJqYmhr?=
 =?utf-8?B?K1dtTmpwc3JOMWVnV3dDSXUwSmdMVVdtVlJsZTNzYklpdGw4SEhsSUppTW1J?=
 =?utf-8?B?RFVsTks5YkwzZVBtUmtsRVNiWjdTMTFpS1BPSFg5TmVtZTJOQloxTGdmNGRT?=
 =?utf-8?B?UjU2ZktmY0dxdkFBZ2M4WmxmbnUvaThEemZhTnN5U2FaZTVMeWYra1JRTita?=
 =?utf-8?B?TWJZYnZnUkVKRTVDZUFMRnNNV0NJSURhT1Z3WjRySVJOaVA1M25RK0hLNEhY?=
 =?utf-8?B?cUE9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: a7a1aead-76d8-42a4-1a26-08dbdeaf7ec6
X-MS-Exchange-CrossTenant-AuthSource: MW4PR11MB5776.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Nov 2023 10:02:33.3688
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 5e4UEej3Q46/+U+ZuvnadzJcSDHP9Go2S1ghuC+/eWs4Lcz2B+lS/QeOm+2Fu9KR3vJYQk29LlDRixLyZyAEQGtHDt/T9E02Z8NC0w8Fq78=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW6PR11MB8440
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE
	autolearn=unavailable autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Mon, 06 Nov 2023 02:02:50 -0800 (PST)


On 05.11.2023 17:33, Markus Elfring wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Sun, 5 Nov 2023 17:24:01 +0100
> 
> Add a jump target so that a bit of exception handling can be better
> reused at the end of this function.
> 
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
> ---
>  drivers/net/ethernet/broadcom/asp2/bcmasp.c | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/net/ethernet/broadcom/asp2/bcmasp.c b/drivers/net/ethernet/broadcom/asp2/bcmasp.c
> index 29b04a274d07..675437e44b94 100644
> --- a/drivers/net/ethernet/broadcom/asp2/bcmasp.c
> +++ b/drivers/net/ethernet/broadcom/asp2/bcmasp.c
> @@ -1304,9 +1304,8 @@ static int bcmasp_probe(struct platform_device *pdev)
>  		intf = bcmasp_interface_create(priv, intf_node, i);
>  		if (!intf) {
>  			dev_err(dev, "Cannot create eth interface %d\n", i);
> -			bcmasp_remove_intfs(priv);
>  			of_node_put(intf_node);
> -			goto of_put_exit;
> +			goto remove_intfs;
>  		}
>  		list_add_tail(&intf->list, &priv->intfs);
>  		i++;
> @@ -1331,8 +1330,7 @@ static int bcmasp_probe(struct platform_device *pdev)
>  			netdev_err(intf->ndev,
>  				   "failed to register net_device: %d\n", ret);
>  			priv->destroy_wol(priv);
> -			bcmasp_remove_intfs(priv);
> -			goto of_put_exit;
> +			goto remove_intfs;
>  		}
>  		count++;
>  	}
> @@ -1342,6 +1340,10 @@ static int bcmasp_probe(struct platform_device *pdev)
>  of_put_exit:
>  	of_node_put(ports_node);
>  	return ret;
> +
> +remove_intfs:
> +	bcmasp_remove_intfs(priv);
> +	goto of_put_exit;

Why is it at the end of the function? Just move it above of_put_exit and it will naturally 
go to the of_node_put call. No need for "goto of_put_exit".

>  }
> 
>  static void bcmasp_remove(struct platform_device *pdev)
> --
> 2.42.0
> 
>