net: airoha: Rename airoha_set_gdm_port_fwd_cfg() in airoha_set_vip_for_gdm_port()

Rename airoha_set_gdm_port() in airoha_set_vip_for_gdm_port().
Get rid of airoha_set_gdm_ports routine.

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/ethernet/airoha/airoha_eth.c b/drivers/net/ethernet/airoha/airoha_eth.c
index 4e74fd1..8a5f7c0 100644 (file)
--- a/drivers/net/ethernet/airoha/airoha_eth.c
+++ b/drivers/net/ethernet/airoha/airoha_eth.c
@@ -105,25 +105,23 @@ static void airoha_set_gdm_port_fwd_cfg(struct airoha_eth *eth, u32 addr,
                      FIELD_PREP(GDM_UCFQ_MASK, val));
 }
 
-static int airoha_set_gdm_port(struct airoha_eth *eth, int port, bool enable)
+static int airoha_set_vip_for_gdm_port(struct airoha_gdm_port *port,
+                                      bool enable)
 {
+       struct airoha_eth *eth = port->qdma->eth;
        u32 vip_port;
 
-       switch (port) {
-       case XSI_PCIE0_PORT:
+       switch (port->id) {
+       case 3:
+               /* FIXME: handle XSI_PCIE1_PORT */
                vip_port = XSI_PCIE0_VIP_PORT_MASK;
                break;
-       case XSI_PCIE1_PORT:
-               vip_port = XSI_PCIE1_VIP_PORT_MASK;
-               break;
-       case XSI_USB_PORT:
-               vip_port = XSI_USB_VIP_PORT_MASK;
-               break;
-       case XSI_ETH_PORT:
+       case 4:
+               /* FIXME: handle XSI_USB_PORT */
                vip_port = XSI_ETH_VIP_PORT_MASK;
                break;
        default:
-               return -EINVAL;
+               return 0;
        }
 
        if (enable) {
@@ -137,31 +135,6 @@ static int airoha_set_gdm_port(struct airoha_eth *eth, int port, bool enable)
        return 0;
 }
 
-static int airoha_set_gdm_ports(struct airoha_eth *eth, bool enable)
-{
-       const int port_list[] = {
-               XSI_PCIE0_PORT,
-               XSI_PCIE1_PORT,
-               XSI_USB_PORT,
-               XSI_ETH_PORT
-       };
-       int i, err;
-
-       for (i = 0; i < ARRAY_SIZE(port_list); i++) {
-               err = airoha_set_gdm_port(eth, port_list[i], enable);
-               if (err)
-                       goto error;
-       }
-
-       return 0;
-
-error:
-       for (i--; i >= 0; i--)
-               airoha_set_gdm_port(eth, port_list[i], false);
-
-       return err;
-}
-
 static void airoha_fe_maccr_init(struct airoha_eth *eth)
 {
        int p;
@@ -1539,7 +1512,7 @@ static int airoha_dev_open(struct net_device *dev)
        int err;
 
        netif_tx_start_all_queues(dev);
-       err = airoha_set_gdm_ports(qdma->eth, true);
+       err = airoha_set_vip_for_gdm_port(port, true);
        if (err)
                return err;
 
@@ -1565,7 +1538,7 @@ static int airoha_dev_stop(struct net_device *dev)
        int i, err;
 
        netif_tx_disable(dev);
-       err = airoha_set_gdm_ports(qdma->eth, false);
+       err = airoha_set_vip_for_gdm_port(port, false);
        if (err)
                return err;
 

diff --git a/drivers/net/ethernet/airoha/airoha_eth.h b/drivers/net/ethernet/airoha/airoha_eth.h
index 74bdfd9..4483422 100644 (file)
--- a/drivers/net/ethernet/airoha/airoha_eth.h
+++ b/drivers/net/ethernet/airoha/airoha_eth.h
@@ -57,14 +57,6 @@ enum {
        QDMA_INT_REG_MAX
 };
 
-enum {
-       XSI_PCIE0_PORT,
-       XSI_PCIE1_PORT,
-       XSI_USB_PORT,
-       XSI_AE_PORT,
-       XSI_ETH_PORT,
-};
-
 enum {
        XSI_PCIE0_VIP_PORT_MASK = BIT(22),
        XSI_PCIE1_VIP_PORT_MASK = BIT(23),