Commit a8aa20a6 authored by Andrew Halaney's avatar Andrew Halaney Committed by David S. Miller

net: stmmac: dwmac-qcom-ethqos: Use of_get_phy_mode() over device_get_phy_mode()

Since this driver only uses devicetree, let's move over to
of_get_phy_mode(). That API has an explicit error return and produces a
phy_interface_t directly instead of an int when representing the phy
mode.
Signed-off-by: default avatarAndrew Halaney <ahalaney@redhat.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 47b7acfb
...@@ -4,10 +4,10 @@ ...@@ -4,10 +4,10 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/of_net.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/phy.h> #include <linux/phy.h>
#include <linux/phy/phy.h> #include <linux/phy/phy.h>
#include <linux/property.h>
#include "stmmac.h" #include "stmmac.h"
#include "stmmac_platform.h" #include "stmmac_platform.h"
...@@ -104,7 +104,7 @@ struct qcom_ethqos { ...@@ -104,7 +104,7 @@ struct qcom_ethqos {
struct clk *link_clk; struct clk *link_clk;
struct phy *serdes_phy; struct phy *serdes_phy;
unsigned int speed; unsigned int speed;
int phy_mode; phy_interface_t phy_mode;
const struct ethqos_emac_por *por; const struct ethqos_emac_por *por;
unsigned int num_por; unsigned int num_por;
...@@ -720,7 +720,9 @@ static int qcom_ethqos_probe(struct platform_device *pdev) ...@@ -720,7 +720,9 @@ static int qcom_ethqos_probe(struct platform_device *pdev)
if (!ethqos) if (!ethqos)
return -ENOMEM; return -ENOMEM;
ethqos->phy_mode = device_get_phy_mode(dev); ret = of_get_phy_mode(np, &ethqos->phy_mode);
if (ret)
return dev_err_probe(dev, ret, "Failed to get phy mode\n");
switch (ethqos->phy_mode) { switch (ethqos->phy_mode) {
case PHY_INTERFACE_MODE_RGMII: case PHY_INTERFACE_MODE_RGMII:
case PHY_INTERFACE_MODE_RGMII_ID: case PHY_INTERFACE_MODE_RGMII_ID:
...@@ -731,8 +733,6 @@ static int qcom_ethqos_probe(struct platform_device *pdev) ...@@ -731,8 +733,6 @@ static int qcom_ethqos_probe(struct platform_device *pdev)
case PHY_INTERFACE_MODE_SGMII: case PHY_INTERFACE_MODE_SGMII:
ethqos->configure_func = ethqos_configure_sgmii; ethqos->configure_func = ethqos_configure_sgmii;
break; break;
case -ENODEV:
return -ENODEV;
default: default:
return -EINVAL; return -EINVAL;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment