ravb: Factorise ravb_adjust_link function

R-Car supports 100 and 1000 Mbps transfer speed whereas RZ/G2L
in addition support 10Mbps. Factorise ravb_adjust_link function
in order to support 10Mbps speed.

Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/renesas/ravb.h b/drivers/net/ethernet/renesas/ravb.h
index 00f2d67b4dad35f3486ff9a1678d13130773d5bd..9879690c5cd8aa07bcaaedfbbb19cc2ba0a1bd9e 100644 (file)
--- a/drivers/net/ethernet/renesas/ravb.h
+++ b/drivers/net/ethernet/renesas/ravb.h
@@ -984,6 +984,7 @@ struct ravb_hw_info {
        void (*rx_ring_format)(struct net_device *ndev, int q);
        void *(*alloc_rx_desc)(struct net_device *ndev, int q);
        bool (*receive)(struct net_device *ndev, int *quota, int q);
+       void (*set_rate)(struct net_device *ndev);
        const char (*gstrings_stats)[ETH_GSTRING_LEN];
        size_t gstrings_size;
        netdev_features_t net_hw_features;

diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
index 1cace5324261b40db50535595a30dfc3c9c28161..1f9d9f54bf1bea57b4891452317b80d44dca2bfa 100644 (file)
--- a/drivers/net/ethernet/renesas/ravb_main.c
+++ b/drivers/net/ethernet/renesas/ravb_main.c
@@ -996,6 +996,7 @@ out:
 static void ravb_adjust_link(struct net_device *ndev)
 {
        struct ravb_private *priv = netdev_priv(ndev);
+       const struct ravb_hw_info *info = priv->info;
        struct phy_device *phydev = ndev->phydev;
        bool new_state = false;
        unsigned long flags;
@@ -1010,7 +1011,7 @@ static void ravb_adjust_link(struct net_device *ndev)
                if (phydev->speed != priv->speed) {
                        new_state = true;
                        priv->speed = phydev->speed;
-                       ravb_set_rate(ndev);
+                       info->set_rate(ndev);
                }
                if (!priv->link) {
                        ravb_modify(ndev, ECMR, ECMR_TXF, 0);
@@ -1978,6 +1979,7 @@ static const struct ravb_hw_info ravb_gen3_hw_info = {
        .rx_ring_format = ravb_rx_ring_format,
        .alloc_rx_desc = ravb_alloc_rx_desc,
        .receive = ravb_rcar_rx,
+       .set_rate = ravb_set_rate,
        .gstrings_stats = ravb_gstrings_stats,
        .gstrings_size = sizeof(ravb_gstrings_stats),
        .net_hw_features = NETIF_F_RXCSUM,
@@ -1995,6 +1997,7 @@ static const struct ravb_hw_info ravb_gen2_hw_info = {
        .rx_ring_format = ravb_rx_ring_format,
        .alloc_rx_desc = ravb_alloc_rx_desc,
        .receive = ravb_rcar_rx,
+       .set_rate = ravb_set_rate,
        .gstrings_stats = ravb_gstrings_stats,
        .gstrings_size = sizeof(ravb_gstrings_stats),
        .net_hw_features = NETIF_F_RXCSUM,