From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
To: Andrew Lunn <andrew@lunn.ch>, Heiner Kallweit <hkallweit1@gmail.com>
Cc: "David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Ioana Ciornei <ioana.ciornei@nxp.com>,
Jakub Kicinski <kuba@kernel.org>,
Madalin Bucur <madalin.bucur@nxp.com>,
netdev@vger.kernel.org, Paolo Abeni <pabeni@redhat.com>,
Sean Anderson <sean.anderson@seco.com>
Subject: [PATCH net-next 8/8] net: pcs: lynx: change lynx_pcs_create() to return error-pointers
Date: Fri, 02 Jun 2023 16:45:49 +0100 [thread overview]
Message-ID: <E1q56yL-00BsvA-WA@rmk-PC.armlinux.org.uk> (raw)
In-Reply-To: <ZHoOe9K/dZuW2pOe@shell.armlinux.org.uk>
Change lynx_pcs_create() to return an error-pointer on failure to
allocate memory, rather than returning NULL. This allows the removal
of the conversion in lynx_pcs_create_fwnode() and
lynx_pcs_create_mdiodev().
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
---
drivers/net/pcs/pcs-lynx.c | 14 +-------------
1 file changed, 1 insertion(+), 13 deletions(-)
diff --git a/drivers/net/pcs/pcs-lynx.c b/drivers/net/pcs/pcs-lynx.c
index b8c66137e28d..c2d01da40430 100644
--- a/drivers/net/pcs/pcs-lynx.c
+++ b/drivers/net/pcs/pcs-lynx.c
@@ -313,7 +313,7 @@ static struct phylink_pcs *lynx_pcs_create(struct mdio_device *mdio)
lynx = kzalloc(sizeof(*lynx), GFP_KERNEL);
if (!lynx)
- return NULL;
+ return ERR_PTR(-ENOMEM);
mdio_device_get(mdio);
lynx->mdio = mdio;
@@ -334,12 +334,6 @@ struct phylink_pcs *lynx_pcs_create_mdiodev(struct mii_bus *bus, int addr)
pcs = lynx_pcs_create(mdio);
- /* Convert failure to create the PCS to an error pointer, so this
- * function has a consistent return value strategy.
- */
- if (!pcs)
- pcs = ERR_PTR(-ENOMEM);
-
/* lynx_create() has taken a refcount on the mdiodev if it was
* successful. If lynx_create() fails, this will free the mdio
* device here. In any case, we don't need to hold our reference
@@ -363,12 +357,6 @@ struct phylink_pcs *lynx_pcs_create_fwnode(struct fwnode_handle *node)
pcs = lynx_pcs_create(mdio);
- /* Convert failure to create the PCS to an error pointer, so this
- * function has a consistent return value strategy.
- */
- if (!pcs)
- pcs = ERR_PTR(-ENOMEM);
-
/* lynx_create() has taken a refcount on the mdiodev if it was
* successful. If lynx_create() fails, this will free the mdio
* device here. In any case, we don't need to hold our reference
--
2.30.2
next prev parent reply other threads:[~2023-06-02 15:45 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-02 15:44 [PATCH net-next 0/8] complete Lynx mdio device handling Russell King (Oracle)
2023-06-02 15:45 ` [PATCH net-next 1/8] net: dpaa2-mac: allow lynx PCS to manage mdiodev lifetime Russell King (Oracle)
2023-06-02 15:45 ` [PATCH net-next 2/8] net: fman_memac: allow lynx PCS to handle " Russell King (Oracle)
2023-06-02 15:45 ` [PATCH net-next 3/8] net: pcs: lynx: remove lynx_get_mdio_device() Russell King (Oracle)
2023-06-02 15:45 ` [PATCH net-next 4/8] net: pcs: lynx: add lynx_pcs_create_fwnode() Russell King (Oracle)
2023-06-02 15:51 ` Sean Anderson
2023-06-06 11:25 ` Russell King (Oracle)
2023-06-02 15:45 ` [PATCH net-next 5/8] net: dpaa2-mac: use lynx_pcs_create_fwnode() Russell King (Oracle)
2023-06-02 15:45 ` [PATCH net-next 6/8] net: fman_memac: " Russell King (Oracle)
2023-06-02 15:45 ` [PATCH net-next 7/8] net: pcs: lynx: make lynx_pcs_create() static Russell King (Oracle)
2023-06-02 15:45 ` Russell King (Oracle) [this message]
2023-06-06 11:09 ` [PATCH net-next 0/8] complete Lynx mdio device handling Russell King (Oracle)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1q56yL-00BsvA-WA@rmk-PC.armlinux.org.uk \
--to=rmk+kernel@armlinux.org.uk \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=hkallweit1@gmail.com \
--cc=ioana.ciornei@nxp.com \
--cc=kuba@kernel.org \
--cc=madalin.bucur@nxp.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=sean.anderson@seco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).