[PATCH v2 03/11] net: dwc_eth_qos: Move interface() to eqos_ops structure

[David Wu]

After moving to eqos_ops, if eqos_config is defined
outside file, can not export interface() definition,
only export eqos_ops struct defined in dwc_eth_qos.c.

Signed-off-by: David Wu <david...@rock-chips.com>
---

Changes in v2:
- None

 drivers/net/dwc_eth_qos.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/net/dwc_eth_qos.c b/drivers/net/dwc_eth_qos.c
index 54866aff6b..613cfb48ea 100644
--- a/drivers/net/dwc_eth_qos.c
+++ b/drivers/net/dwc_eth_qos.c
@@ -267,7 +267,6 @@ struct eqos_config {
        int swr_wait;
        int config_mac;
        int config_mac_mdio;
-       phy_interface_t (*interface)(struct udevice *dev);
        struct eqos_ops *ops;
 };
 
@@ -286,6 +285,7 @@ struct eqos_ops {
        int (*eqos_disable_calibration)(struct udevice *dev);
        int (*eqos_set_tx_clk_speed)(struct udevice *dev);
        ulong (*eqos_get_tick_clk_rate)(struct udevice *dev);
+       phy_interface_t (*eqos_get_interface)(struct udevice *dev);
 };
 
 struct eqos_priv {
@@ -1096,7 +1096,7 @@ static int eqos_start(struct udevice *dev)
         */
        if (!eqos->phy) {
                eqos->phy = phy_connect(eqos->mii, eqos->phyaddr, dev,
-                                       eqos->config->interface(dev));
+                         eqos->config->ops->eqos_get_interface(dev));
                if (!eqos->phy) {
                        pr_err("phy_connect() failed");
                        goto err_stop_resets;
@@ -1666,7 +1666,7 @@ static int eqos_probe_resources_stm32(struct udevice *dev)
 
        debug("%s(dev=%p):\n", __func__, dev);
 
-       interface = eqos->config->interface(dev);
+       interface = eqos->config->ops->eqos_get_interface(dev);
 
        if (interface == PHY_INTERFACE_MODE_NONE) {
                pr_err("Invalid PHY interface\n");
@@ -1909,7 +1909,8 @@ static struct eqos_ops eqos_tegra186_ops = {
        .eqos_calibrate_pads = eqos_calibrate_pads_tegra186,
        .eqos_disable_calibration = eqos_disable_calibration_tegra186,
        .eqos_set_tx_clk_speed = eqos_set_tx_clk_speed_tegra186,
-       .eqos_get_tick_clk_rate = eqos_get_tick_clk_rate_tegra186
+       .eqos_get_tick_clk_rate = eqos_get_tick_clk_rate_tegra186,
+       .eqos_get_interface = eqos_get_interface_tegra186
 };
 
 static const struct eqos_config eqos_tegra186_config = {
@@ -1918,7 +1919,6 @@ static const struct eqos_config eqos_tegra186_config = {
        .swr_wait = 10,
        .config_mac = EQOS_MAC_RXQ_CTRL0_RXQ0EN_ENABLED_DCB,
        .config_mac_mdio = EQOS_MAC_MDIO_ADDRESS_CR_20_35,
-       .interface = eqos_get_interface_tegra186,
        .ops = &eqos_tegra186_ops
 };
 
@@ -1936,7 +1936,8 @@ static struct eqos_ops eqos_stm32_ops = {
        .eqos_calibrate_pads = eqos_calibrate_pads_stm32,
        .eqos_disable_calibration = eqos_disable_calibration_stm32,
        .eqos_set_tx_clk_speed = eqos_set_tx_clk_speed_stm32,
-       .eqos_get_tick_clk_rate = eqos_get_tick_clk_rate_stm32
+       .eqos_get_tick_clk_rate = eqos_get_tick_clk_rate_stm32,
+       .eqos_get_interface = eqos_get_interface_stm32
 };
 
 static const struct eqos_config eqos_stm32_config = {
@@ -1945,7 +1946,6 @@ static const struct eqos_config eqos_stm32_config = {
        .swr_wait = 50,
        .config_mac = EQOS_MAC_RXQ_CTRL0_RXQ0EN_ENABLED_AV,
        .config_mac_mdio = EQOS_MAC_MDIO_ADDRESS_CR_250_300,
-       .interface = eqos_get_interface_stm32,
        .ops = &eqos_stm32_ops
 };
 
-- 
2.19.1