linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Horatiu Vultur <horatiu.vultur@microchip.com>
To: unlisted-recipients:; (no To-header on input)
Cc: <alexandre.belloni@bootlin.com>, <UNGLinuxDriver@microchip.com>,
	<davem@davemloft.net>, <andrew@lunn.ch>, <netdev@vger.kernel.org>,
	<linux-kernel@vger.kernel.org>,
	Horatiu Vultur <horatiu.vultur@microchip.com>
Subject: [PATCH] net: mscc: ocelot: reinterpret the return value of of_get_phy_mode
Date: Mon, 11 Nov 2019 17:21:27 +0100	[thread overview]
Message-ID: <20191111162127.18684-1-horatiu.vultur@microchip.com> (raw)

The commit 0c65b2b90d13c ("net: of_get_phy_mode: Change API to solve
int/unit warnings") updated the function of_get_phy_mode declaration.
Now it returns an error code and in case the node doesn't contain the
property 'phy-mode' or 'phy-connection-type' it returns -EINVAL.

In Ocelot the return code of the function was checked against -ENODEV
which is not true so it would failed to probe the port and then
eventually failed to probe the driver.

The fix consists in just checking if the function of_get_phy_mode returns
an error and in that case just fall back and use the interface
PHY_INTERFACE_MODE_NA.

This patch is based on the patch series:
https://patchwork.ozlabs.org/project/netdev/list/?series=141849

Signed-off-by: Horatiu Vultur <horatiu.vultur@microchip.com>
---
 drivers/net/ethernet/mscc/ocelot_board.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/mscc/ocelot_board.c b/drivers/net/ethernet/mscc/ocelot_board.c
index 811599f32910..677701355da2 100644
--- a/drivers/net/ethernet/mscc/ocelot_board.c
+++ b/drivers/net/ethernet/mscc/ocelot_board.c
@@ -378,6 +378,7 @@ static int mscc_ocelot_probe(struct platform_device *pdev)
 		struct phy *serdes;
 		void __iomem *regs;
 		char res_name[8];
+		int phy_err;
 		u32 port;
 
 		if (of_property_read_u32(portnp, "reg", &port))
@@ -410,9 +411,9 @@ static int mscc_ocelot_probe(struct platform_device *pdev)
 		priv = container_of(ocelot_port, struct ocelot_port_private,
 				    port);
 
-		err = of_get_phy_mode(portnp, &phy_mode);
-		if (err && err != -ENODEV)
-			goto out_put_ports;
+		phy_err = of_get_phy_mode(portnp, &phy_mode);
+		if (phy_err)
+			phy_mode = PHY_INTERFACE_MODE_NA;
 
 		priv->phy_mode = phy_mode;
 
-- 
2.17.1


             reply	other threads:[~2019-11-11 16:25 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-11 16:21 Horatiu Vultur [this message]
2019-11-11 21:47 ` [PATCH] net: mscc: ocelot: reinterpret the return value of of_get_phy_mode Woojung.Huh

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=20191111162127.18684-1-horatiu.vultur@microchip.com \
    --to=horatiu.vultur@microchip.com \
    --cc=UNGLinuxDriver@microchip.com \
    --cc=alexandre.belloni@bootlin.com \
    --cc=andrew@lunn.ch \
    --cc=davem@davemloft.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    /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).