Subject: [PATCH v2 1/1] net: dsa: replacing the hard-coded sized array "dsa_switch" by dynamic one

From: Andrey Volkov <[email-masked]>
Date: Thu, 04 Dec 2014 16:54:32 +0100

Replacing the hard-coded sized array "dsa_switch" by dynamic one
and remove useless DSA_MAX_SWITCHES define.
This patch also make dsa_switch_tree scalable from the "usual"
1-2 up to 10th switches configuration.

Signed-off-by: Andrey Volkov <[email-masked]>
---
 include/net/dsa.h |    3 +--
 net/dsa/dsa.c     |    7 +++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/include/net/dsa.h b/include/net/dsa.h
index ed3c34b..733db2e 100644
--- a/include/net/dsa.h
+++ b/include/net/dsa.h
@@ -28,7 +28,6 @@ enum dsa_tag_protocol {
     DSA_TAG_PROTO_BRCM,
 };
 
-#define DSA_MAX_SWITCHES    4
 #define DSA_MAX_PORTS        12
 
 struct dsa_chip_data {
@@ -117,7 +116,7 @@ struct dsa_switch_tree {
     /*
      * Data for the individual switch chips.
      */
-    struct dsa_switch    *ds[DSA_MAX_SWITCHES];
+    struct dsa_switch    *ds[];
 };
 
 struct dsa_switch {
diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index 322c778..c081a19 100644
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@ -604,8 +604,6 @@ static int dsa_of_probe(struct platform_device *pdev)
     pdev->dev.platform_data = pd;
     pd->netdev = &ethernet_dev->dev;
     pd->nr_chips = of_get_child_count(np);
-    if (pd->nr_chips > DSA_MAX_SWITCHES)
-        pd->nr_chips = DSA_MAX_SWITCHES;
 
     pd->chip = kcalloc(pd->nr_chips, sizeof(struct dsa_chip_data),
                GFP_KERNEL);
@@ -717,7 +715,7 @@ static int dsa_probe(struct platform_device *pdev)
         pd = pdev->dev.platform_data;
     }
 
-    if (pd == NULL || pd->netdev == NULL)
+    if (pd == NULL || pd->netdev == NULL || pd->nr_chips == 0)
         return -EINVAL;
 
     dev = dev_to_net_device(pd->netdev);
@@ -732,7 +730,8 @@ static int dsa_probe(struct platform_device *pdev)
         goto out;
     }
 
-    dst = kzalloc(sizeof(*dst), GFP_KERNEL);
+    dst = kzalloc(sizeof(*dst) +
+            sizeof(struct dsa_switch *) * pd->nr_chips, GFP_KERNEL);
     if (dst == NULL) {
         dev_put(dev);
         ret = -ENOMEM;