diff options
| author | Vivien Didelot <vivien.didelot@savoirfairelinux.com> | 2017-06-01 16:07:12 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-06-01 17:34:56 -0400 |
| commit | 02f840cbc9fa9ee147d882edb96b203999c3ac62 (patch) | |
| tree | ed1c6129025a0046feffba597036cbd0b73b99be | |
| parent | 73a7ece8f70c955464080e434b5324bcdfdcb1b1 (diff) | |
| download | linux-stable-02f840cbc9fa9ee147d882edb96b203999c3ac62.tar.gz linux-stable-02f840cbc9fa9ee147d882edb96b203999c3ac62.tar.bz2 linux-stable-02f840cbc9fa9ee147d882edb96b203999c3ac62.zip | |
net: dsa: do not cast dst
dsa_ptr is not a void pointer anymore since Nov 2011, as of cf50dcc24f82
("dsa: Change dsa_uses_{dsa, trailer}_tags() into inline functions"),
but an explicit dsa_switch_tree pointer, thus remove the (void *) cast.
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/dsa/dsa2.c | 2 | ||||
| -rw-r--r-- | net/dsa/legacy.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c index c0a4576db4a2..21b44a9828f6 100644 --- a/net/dsa/dsa2.c +++ b/net/dsa/dsa2.c @@ -454,7 +454,7 @@ static int dsa_dst_apply(struct dsa_switch_tree *dst) * sent to the tag format's receive function. */ wmb(); - dst->master_netdev->dsa_ptr = (void *)dst; + dst->master_netdev->dsa_ptr = dst; dst->applied = true; return 0; diff --git a/net/dsa/legacy.c b/net/dsa/legacy.c index ac4379b8d7ac..d70a1a788d17 100644 --- a/net/dsa/legacy.c +++ b/net/dsa/legacy.c @@ -651,7 +651,7 @@ static int dsa_setup_dst(struct dsa_switch_tree *dst, struct net_device *dev, * sent to the tag format's receive function. */ wmb(); - dev->dsa_ptr = (void *)dst; + dev->dsa_ptr = dst; return 0; } |