net: dsa: use temporary dsa_device_ops variable

When resolving the DSA tagging protocol used by a CPU switch, use a
temporary "tag_ops" variable to store the dsa_device_ops instead of
using directly dst->tag_ops. This will make the future patches moving
this pointer around easier to read.

There is no functional changes.

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

diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c
index dcccaebde708626adfcd1b2d3a02ec46e07bc0a5..6a10c5c1639f26bb595e9c8b78523728fc782ab3 100644 (file)
--- a/net/dsa/dsa2.c
+++ b/net/dsa/dsa2.c
@@ -485,6 +485,7 @@ static int dsa_cpu_parse(struct dsa_port *port, u32 index,
                         struct dsa_switch_tree *dst,
                         struct dsa_switch *ds)
 {
+       const struct dsa_device_ops *tag_ops;
        enum dsa_tag_protocol tag_protocol;
        struct net_device *ethernet_dev;
        struct device_node *ethernet;
@@ -514,13 +515,14 @@ static int dsa_cpu_parse(struct dsa_port *port, u32 index,
        ds->cpu_port_mask |= BIT(index);
 
        tag_protocol = ds->ops->get_tag_protocol(ds);
-       dst->tag_ops = dsa_resolve_tag_protocol(tag_protocol);
-       if (IS_ERR(dst->tag_ops)) {
+       tag_ops = dsa_resolve_tag_protocol(tag_protocol);
+       if (IS_ERR(tag_ops)) {
                dev_warn(ds->dev, "No tagger for this switch\n");
                ds->cpu_port_mask &= ~BIT(index);
-               return PTR_ERR(dst->tag_ops);
+               return PTR_ERR(tag_ops);
        }
 
+       dst->tag_ops = tag_ops;
        dst->rcv = dst->tag_ops->rcv;
 
        return 0;

diff --git a/net/dsa/legacy.c b/net/dsa/legacy.c
index ae505d8e4417bc60a98c314147c437eef64f9574..8e849013f69d92bf5611c06a834317c1230b9fbb 100644 (file)
--- a/net/dsa/legacy.c
+++ b/net/dsa/legacy.c
@@ -144,13 +144,15 @@ static int dsa_switch_setup_one(struct dsa_switch *ds,
         * switch.
         */
        if (dst->cpu_dp->ds == ds) {
+               const struct dsa_device_ops *tag_ops;
                enum dsa_tag_protocol tag_protocol;
 
                tag_protocol = ops->get_tag_protocol(ds);
-               dst->tag_ops = dsa_resolve_tag_protocol(tag_protocol);
-               if (IS_ERR(dst->tag_ops))
-                       return PTR_ERR(dst->tag_ops);
+               tag_ops = dsa_resolve_tag_protocol(tag_protocol);
+               if (IS_ERR(tag_ops))
+                       return PTR_ERR(tag_ops);
 
+               dst->tag_ops = tag_ops;
                dst->rcv = dst->tag_ops->rcv;
        }