net: dsa: Remove dynamic allocate of routing table

With a maximum of four switches, the size of the routing table is the
same as the pointer to it. Removing it makes the code simpler.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 0 insertions, 12 deletions

diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index 5907f8cd13b6..6177dd750847 100644
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@ -587,17 +587,6 @@ static int dsa_of_setup_routing_table(struct dsa_platform_data *pd,
         if (link_sw_addr >= pd->nr_chips)
                 return -EINVAL;
 
-        /* First time routing table allocation */
-        if (!cd->rtable) {
-                cd->rtable = kmalloc_array(pd->nr_chips, sizeof(s8),
-                                           GFP_KERNEL);
-                if (!cd->rtable)
-                        return -ENOMEM;
-
-                /* default to no valid uplink/downlink */
-                memset(cd->rtable, -1, pd->nr_chips * sizeof(s8));
-        }
-
         cd->rtable[link_sw_addr] = port_index;
 
         return 0;
@@ -639,7 +628,6 @@ static void dsa_of_free_platform_data(struct dsa_platform_data *pd)
                         kfree(pd->chip[i].port_names[port_index]);
                         port_index++;
                 }
-                kfree(pd->chip[i].rtable);
 
                 /* Drop our reference to the MDIO bus device */
                 if (pd->chip[i].host_dev)