Skip to content

Commit 9812307

Browse files
JasonYanHwdavem330
authored andcommitted
net: dsa: mv88e6xxx: remove duplicate assignment of struct members
These struct members named 'phylink_validate' was assigned twice: static const struct mv88e6xxx_ops mv88e6190_ops = { ...... .phylink_validate = mv88e6390_phylink_validate, ...... .phylink_validate = mv88e6390_phylink_validate, }; static const struct mv88e6xxx_ops mv88e6190x_ops = { ...... .phylink_validate = mv88e6390_phylink_validate, ...... .phylink_validate = mv88e6390x_phylink_validate, }; static const struct mv88e6xxx_ops mv88e6191_ops = { ...... .phylink_validate = mv88e6390_phylink_validate, ...... .phylink_validate = mv88e6390_phylink_validate, }; static const struct mv88e6xxx_ops mv88e6290_ops = { ...... .phylink_validate = mv88e6390_phylink_validate, ...... .phylink_validate = mv88e6390_phylink_validate, }; Remove all the first one and leave the second one which are been used in fact. Be aware that for 'mv88e6190x_ops' the assignment functions is different while the others are all the same. This fixes the following coccicheck warning: drivers/net/dsa/mv88e6xxx/chip.c:3911:48-49: phylink_validate: first occurrence line 3965, second occurrence line 3967 drivers/net/dsa/mv88e6xxx/chip.c:3970:49-50: phylink_validate: first occurrence line 4024, second occurrence line 4026 drivers/net/dsa/mv88e6xxx/chip.c:4029:48-49: phylink_validate: first occurrence line 4082, second occurrence line 4085 drivers/net/dsa/mv88e6xxx/chip.c:4184:48-49: phylink_validate: first occurrence line 4238, second occurrence line 4242 Fixes: 4262c38 ("net: dsa: mv88e6xxx: Add SERDES stats counters to all 6390 family members") Signed-off-by: Jason Yan <[email protected]> Reviewed-by: Russell King <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 8999dc8 commit 9812307

File tree

1 file changed

+0
-4
lines changed
  • drivers/net/dsa/mv88e6xxx

1 file changed

+0
-4
lines changed

drivers/net/dsa/mv88e6xxx/chip.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3962,7 +3962,6 @@ static const struct mv88e6xxx_ops mv88e6190_ops = {
39623962
.serdes_get_stats = mv88e6390_serdes_get_stats,
39633963
.serdes_get_regs_len = mv88e6390_serdes_get_regs_len,
39643964
.serdes_get_regs = mv88e6390_serdes_get_regs,
3965-
.phylink_validate = mv88e6390_phylink_validate,
39663965
.gpio_ops = &mv88e6352_gpio_ops,
39673966
.phylink_validate = mv88e6390_phylink_validate,
39683967
};
@@ -4021,7 +4020,6 @@ static const struct mv88e6xxx_ops mv88e6190x_ops = {
40214020
.serdes_get_stats = mv88e6390_serdes_get_stats,
40224021
.serdes_get_regs_len = mv88e6390_serdes_get_regs_len,
40234022
.serdes_get_regs = mv88e6390_serdes_get_regs,
4024-
.phylink_validate = mv88e6390_phylink_validate,
40254023
.gpio_ops = &mv88e6352_gpio_ops,
40264024
.phylink_validate = mv88e6390x_phylink_validate,
40274025
};
@@ -4079,7 +4077,6 @@ static const struct mv88e6xxx_ops mv88e6191_ops = {
40794077
.serdes_get_stats = mv88e6390_serdes_get_stats,
40804078
.serdes_get_regs_len = mv88e6390_serdes_get_regs_len,
40814079
.serdes_get_regs = mv88e6390_serdes_get_regs,
4082-
.phylink_validate = mv88e6390_phylink_validate,
40834080
.avb_ops = &mv88e6390_avb_ops,
40844081
.ptp_ops = &mv88e6352_ptp_ops,
40854082
.phylink_validate = mv88e6390_phylink_validate,
@@ -4235,7 +4232,6 @@ static const struct mv88e6xxx_ops mv88e6290_ops = {
42354232
.serdes_get_stats = mv88e6390_serdes_get_stats,
42364233
.serdes_get_regs_len = mv88e6390_serdes_get_regs_len,
42374234
.serdes_get_regs = mv88e6390_serdes_get_regs,
4238-
.phylink_validate = mv88e6390_phylink_validate,
42394235
.gpio_ops = &mv88e6352_gpio_ops,
42404236
.avb_ops = &mv88e6390_avb_ops,
42414237
.ptp_ops = &mv88e6352_ptp_ops,

0 commit comments

Comments
 (0)