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;
Date:   Tue, 1 Aug 2023 15:04:40 +0300
From:   Matti Vaittinen <mazziesaccount@gmail.com>
To:     Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com>,
        Matti Vaittinen <mazziesaccount@gmail.com>
Cc:     Marcin Wojtas <mw@semihalf.com>,
        Russell King <linux@armlinux.org.uk>,
        "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>, netdev@vger.kernel.org,
        linux-kernel@vger.kernel.org
Subject: [PATCH v8 8/8] net-next: mvpp2: don't shadow error
Message-ID: <8c5b976a4ef9ba38fc952e9cf61848baa3e9dfe7.1690890774.git.mazziesaccount@gmail.com>
References: <cover.1690890774.git.mazziesaccount@gmail.com>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
        protocol="application/pgp-signature"; boundary="PxwUsYkRvGz4sbiY"
Content-Disposition: inline
In-Reply-To: <cover.1690890774.git.mazziesaccount@gmail.com>
Precedence: bulk


--PxwUsYkRvGz4sbiY
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Do not overwrite error from lower layers but return the actual error to
user if obtaining an IRQ fails.

Suggested-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Suggested-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Matti Vaittinen <mazziesaccount@gmail.com>
---
 drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/=
ethernet/marvell/mvpp2/mvpp2_main.c
index 2632ffe91ca5..2aba34a2ca76 100644
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
@@ -5830,13 +5830,13 @@ static int mvpp2_multi_queue_vectors_init(struct mv=
pp2_port *port,
 		}
=20
 		if (port_node)
-			v->irq =3D of_irq_get_byname(port_node, irqname);
+			ret =3D of_irq_get_byname(port_node, irqname);
 		else
-			v->irq =3D fwnode_irq_get(port->fwnode, i);
-		if (v->irq < 0) {
-			ret =3D -EINVAL;
+			ret =3D fwnode_irq_get(port->fwnode, i);
+		if (ret < 0)
 			goto err;
-		}
+
+		v->irq =3D ret;
=20
 		netif_napi_add(port->dev, &v->napi, mvpp2_poll);
 	}
--=20
2.40.1


--=20
Matti Vaittinen, Linux device drivers
ROHM Semiconductors, Finland SWDC
Kiviharjunlenkki 1E
90220 OULU
FINLAND

~~~ "I don't think so," said Rene Descartes. Just then he vanished ~~~
Simon says - in Latin please.
~~~ "non cogito me" dixit Rene Descarte, deinde evanescavit ~~~
Thanks to Simon Glass for the translation =3D]=20

--PxwUsYkRvGz4sbiY
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEEIx+f8wZb28fLKEhTeFA3/03aocUFAmTI9NgACgkQeFA3/03a
ocU57QgArf8JlEqKVayQDw6bJdv8CBJaGdYYU28HD2CPjDvfvJ0f1p2wq5csZObK
yX2//Sl3rq+CMldChgW1irUQJ+B5CnDqzgI8s+/IhVn2d5FAMwi54/W7GWOYzOsV
W6po3q+HHPcYb/543T2OWPtm+025lgSIuASVmz5mmvM9gcwRT9q0n08+/nGoL+TO
oUvnI6kl2NJ5Yk7mOl7ggWIhInZc9erugutrjmtgNJ7nodj5swLsesMOZiKco++m
0Rh/TX8529G62BcWzBigKE9AjWEZKZ3EvvYL60hknd+8nI+AGXCabs3ISmtlto2f
YKltDbyq/4Pdub5V4SJuYKd0vaYG6g==
=xXGU
-----END PGP SIGNATURE-----

--PxwUsYkRvGz4sbiY--