Received-SPF: pass (google.com: domain of linux-kernel+bounces-83298-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Message-ID: <9b879c8d-4c28-4748-acf6-18dc69d8ebdf@web.de>
Date: Tue, 27 Feb 2024 14:14:52 +0100
Precedence: bulk
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
To: netdev@vger.kernel.org, kernel-janitors@vger.kernel.org,
 "David S. Miller" <davem@davemloft.net>, Eric Dumazet <edumazet@google.com>,
 Jakub Kicinski <kuba@kernel.org>, Madalin Bucur <madalin.bucur@nxp.com>,
 Paolo Abeni <pabeni@redhat.com>, Sean Anderson <sean.anderson@seco.com>
Content-Language: en-GB
Cc: LKML <linux-kernel@vger.kernel.org>
From: Markus Elfring <Markus.Elfring@web.de>
Subject: [PATCH] net: fman: Use common error handling code in dtsec_init()
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
UI-OutboundReport: notjunk:1;M01:P0:MMHx4LFE7is=;DRqgI+61KeO1S7erGzNs44kiDPH
 VSaTx1zQSD+TWBMa5N3SsnNGpa5Qc+y2x0ZpyHgVo7m0y8hGVom5ru3EWVbXBSYZy02geUb82
 jpGIU+9p22o/I0LK6wvbnrk9xozleo9fLQEVJL+pYkIBkTRHPAE5XlCCtGni1hwdty1QQ+5sU
 kvQX22u9K7s5exwL9rjExyG5F3tD/lL6+rGyOgW4usuN92L4Ss8aGjEhEKY/+B8uy7Zm7cT1d
 UJl+sAOwn63nWxB+x1WNk/MLRgrQ8uArapuVbZu4dBhJe9tfNdHbJDyqFIkFQSO31cgTfsLUS
 7ib0etfM7SK+TesulpXykuqzEXexgXkVc3IjlPBom6h+RoiS/GaCLxaL+vLENRD97G+DuVea0
 d54qKE79zpKM3BcQmSUxVL6CZ+jZGZi43pVJNZe1oUSwpuleK7fiHDTkn7pBuZav/x8BYq42x
 ObHmBUyEj+v0Nk7cyqmvHRkDV4CHO6c1kq2ishjXOMcM19HGud+BrJVGCrHmNBmRbwsPbDYRp
 B3nYWOyyrsZ7TGqoIc7IXe0d3u8KUTzk0HtW0N9Y5oNrXYfnjhV9clC5FWtvQsAJWfZ2O8vFC
 fgsMxjJDudnUI3gyPhbwdRZ+duDbDCoXMlzWkIkoX0ixazNo1UP+hwNCHr/VhLeG9Oir342Fo
 cATnqlDl25tXRPtKN/Z1tkNoE091WZKOZVxNWRNlFoCw+7Xhg9UTPDM4RgNJqy/uaw2moET1w
 //asaFl7VGJjuSaqI2fOjYctRT0LXkk/il1+A0GqWc73/pjma0FO1bH1kY3YnPijgGaO4Vlr3
 gZqTjxAlgGsyqNlEnK1sxN4Jp21vJKwiT9OWmXlWLPSrI=

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Tue, 27 Feb 2024 14:05:25 +0100

Adjust jump targets so that a bit of exception handling can be better
reused at the end of this function implementation.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
=2D--
 .../net/ethernet/freescale/fman/fman_dtsec.c  | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/drivers/net/ethernet/freescale/fman/fman_dtsec.c b/drivers/ne=
t/ethernet/freescale/fman/fman_dtsec.c
index 3088da7adf0f..1de22400fd89 100644
=2D-- a/drivers/net/ethernet/freescale/fman/fman_dtsec.c
+++ b/drivers/net/ethernet/freescale/fman/fman_dtsec.c
@@ -1279,9 +1279,8 @@ static int dtsec_init(struct fman_mac *dtsec)
 		   dtsec->max_speed, dtsec->addr, dtsec->exceptions,
 		   dtsec->tbidev->addr);
 	if (err) {
-		free_init_resources(dtsec);
 		pr_err("DTSEC version doesn't support this i/f mode\n");
-		return err;
+		goto free_resources;
 	}

 	/* Configure the TBI PHY Control Register */
@@ -1296,23 +1295,21 @@ static int dtsec_init(struct fman_mac *dtsec)
 	err =3D fman_set_mac_max_frame(dtsec->fm, dtsec->mac_id, max_frm_ln);
 	if (err) {
 		pr_err("Setting max frame length failed\n");
-		free_init_resources(dtsec);
-		return -EINVAL;
+		err =3D -EINVAL;
+		goto free_resources;
 	}

 	dtsec->multicast_addr_hash =3D
 	alloc_hash_table(EXTENDED_HASH_TABLE_SIZE);
 	if (!dtsec->multicast_addr_hash) {
-		free_init_resources(dtsec);
 		pr_err("MC hash table is failed\n");
-		return -ENOMEM;
+		goto e_nomem;
 	}

 	dtsec->unicast_addr_hash =3D alloc_hash_table(DTSEC_HASH_TABLE_SIZE);
 	if (!dtsec->unicast_addr_hash) {
-		free_init_resources(dtsec);
 		pr_err("UC hash table is failed\n");
-		return -ENOMEM;
+		goto e_nomem;
 	}

 	/* register err intr handler for dtsec to FPM (err) */
@@ -1326,6 +1323,12 @@ static int dtsec_init(struct fman_mac *dtsec)
 	dtsec->dtsec_drv_param =3D NULL;

 	return 0;
+
+e_nomem:
+	err =3D -ENOMEM;
+free_resources:
+	free_init_resources(dtsec);
+	return err;
 }

 static int dtsec_free(struct fman_mac *dtsec)
=2D-
2.43.2