net: ethernet: ti: am65-cpsw: Move code to avoid forward declaration
authorRoger Quadros <rogerq@kernel.org>
Tue, 19 Dec 2023 10:58:01 +0000 (12:58 +0200)
committerDavid S. Miller <davem@davemloft.net>
Sat, 23 Dec 2023 01:01:19 +0000 (01:01 +0000)
Move this code around to avoid forward declaration.
No functional change.

Signed-off-by: Roger Quadros <rogerq@kernel.org>
Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/ti/am65-cpsw-qos.c

index 2c97fa0..862a982 100644 (file)
@@ -56,6 +56,16 @@ enum timer_act {
        TACT_SKIP_PROG,         /* just buffer can be updated */
 };
 
+static u32
+am65_cpsw_qos_tx_rate_calc(u32 rate_mbps, unsigned long bus_freq)
+{
+       u32 ir;
+
+       bus_freq /= 1000000;
+       ir = DIV_ROUND_UP(((u64)rate_mbps * 32768),  bus_freq);
+       return ir;
+}
+
 static int am65_cpsw_port_est_enabled(struct am65_cpsw_port *port)
 {
        return port->qos.est_oper || port->qos.est_admin;
@@ -772,49 +782,6 @@ static int am65_cpsw_qos_setup_tc_block(struct net_device *ndev, struct flow_blo
                                          port, port, true);
 }
 
-int am65_cpsw_qos_ndo_setup_tc(struct net_device *ndev, enum tc_setup_type type,
-                              void *type_data)
-{
-       switch (type) {
-       case TC_QUERY_CAPS:
-               return am65_cpsw_tc_query_caps(ndev, type_data);
-       case TC_SETUP_QDISC_TAPRIO:
-               return am65_cpsw_setup_taprio(ndev, type_data);
-       case TC_SETUP_BLOCK:
-               return am65_cpsw_qos_setup_tc_block(ndev, type_data);
-       default:
-               return -EOPNOTSUPP;
-       }
-}
-
-void am65_cpsw_qos_link_up(struct net_device *ndev, int link_speed)
-{
-       struct am65_cpsw_port *port = am65_ndev_to_port(ndev);
-
-       am65_cpsw_est_link_up(ndev, link_speed);
-       port->qos.link_down_time = 0;
-}
-
-void am65_cpsw_qos_link_down(struct net_device *ndev)
-{
-       struct am65_cpsw_port *port = am65_ndev_to_port(ndev);
-
-       if (!port->qos.link_down_time)
-               port->qos.link_down_time = ktime_get();
-
-       port->qos.link_speed = SPEED_UNKNOWN;
-}
-
-static u32
-am65_cpsw_qos_tx_rate_calc(u32 rate_mbps, unsigned long bus_freq)
-{
-       u32 ir;
-
-       bus_freq /= 1000000;
-       ir = DIV_ROUND_UP(((u64)rate_mbps * 32768),  bus_freq);
-       return ir;
-}
-
 static void
 am65_cpsw_qos_tx_p0_rate_apply(struct am65_cpsw_common *common,
                               int tx_ch, u32 rate_mbps)
@@ -916,3 +883,36 @@ void am65_cpsw_qos_tx_p0_rate_init(struct am65_cpsw_common *common)
                       host->port_base + AM65_CPSW_PN_REG_PRI_CIR(tx_ch));
        }
 }
+
+int am65_cpsw_qos_ndo_setup_tc(struct net_device *ndev, enum tc_setup_type type,
+                              void *type_data)
+{
+       switch (type) {
+       case TC_QUERY_CAPS:
+               return am65_cpsw_tc_query_caps(ndev, type_data);
+       case TC_SETUP_QDISC_TAPRIO:
+               return am65_cpsw_setup_taprio(ndev, type_data);
+       case TC_SETUP_BLOCK:
+               return am65_cpsw_qos_setup_tc_block(ndev, type_data);
+       default:
+               return -EOPNOTSUPP;
+       }
+}
+
+void am65_cpsw_qos_link_up(struct net_device *ndev, int link_speed)
+{
+       struct am65_cpsw_port *port = am65_ndev_to_port(ndev);
+
+       am65_cpsw_est_link_up(ndev, link_speed);
+       port->qos.link_down_time = 0;
+}
+
+void am65_cpsw_qos_link_down(struct net_device *ndev)
+{
+       struct am65_cpsw_port *port = am65_ndev_to_port(ndev);
+
+       if (!port->qos.link_down_time)
+               port->qos.link_down_time = ktime_get();
+
+       port->qos.link_speed = SPEED_UNKNOWN;
+}