Skip to content

Commit dc745ec

Browse files
Russell Kingdavem330
Russell King
authored and
davem330
committed
net: dsa: mv88e6xxx: remove port_link_state functions
The port_link_state method is only used by mv88e6xxx_port_setup_mac(), which is now only called during port setup, rather than also being called via phylink's mac_config method. Remove this now unnecessary optimisation, which allows us to remove the port_link_state methods as well. Signed-off-by: Russell King <[email protected]> Reviewed-by: Andrew Lunn <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent f365c6f commit dc745ec

File tree

4 files changed

+0
-232
lines changed

4 files changed

+0
-232
lines changed

‎drivers/net/dsa/mv88e6xxx/chip.c‎

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -423,30 +423,11 @@ static int mv88e6xxx_port_setup_mac(struct mv88e6xxx_chip *chip, int port,
423423
int link, int speed, int duplex, int pause,
424424
phy_interface_t mode)
425425
{
426-
struct phylink_link_state state;
427426
int err;
428427

429428
if (!chip->info->ops->port_set_link)
430429
return 0;
431430

432-
if (!chip->info->ops->port_link_state)
433-
return 0;
434-
435-
err = chip->info->ops->port_link_state(chip, port, &state);
436-
if (err)
437-
return err;
438-
439-
/* Has anything actually changed? We don't expect the
440-
* interface mode to change without one of the other
441-
* parameters also changing
442-
*/
443-
if (state.link == link &&
444-
state.speed == speed &&
445-
state.duplex == duplex &&
446-
(state.interface == mode ||
447-
state.interface == PHY_INTERFACE_MODE_NA))
448-
return 0;
449-
450431
/* Port's MAC control must not be changed unless the link is down */
451432
err = chip->info->ops->port_set_link(chip, port, LINK_FORCED_DOWN);
452433
if (err)
@@ -3411,7 +3392,6 @@ static const struct mv88e6xxx_ops mv88e6085_ops = {
34113392
.port_pause_limit = mv88e6097_port_pause_limit,
34123393
.port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit,
34133394
.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,
3414-
.port_link_state = mv88e6352_port_link_state,
34153395
.port_get_cmode = mv88e6185_port_get_cmode,
34163396
.port_setup_message_port = mv88e6xxx_setup_message_port,
34173397
.stats_snapshot = mv88e6xxx_g1_stats_snapshot,
@@ -3445,7 +3425,6 @@ static const struct mv88e6xxx_ops mv88e6095_ops = {
34453425
.port_set_frame_mode = mv88e6085_port_set_frame_mode,
34463426
.port_set_egress_floods = mv88e6185_port_set_egress_floods,
34473427
.port_set_upstream_port = mv88e6095_port_set_upstream_port,
3448-
.port_link_state = mv88e6185_port_link_state,
34493428
.port_get_cmode = mv88e6185_port_get_cmode,
34503429
.port_setup_message_port = mv88e6xxx_setup_message_port,
34513430
.stats_snapshot = mv88e6xxx_g1_stats_snapshot,
@@ -3481,7 +3460,6 @@ static const struct mv88e6xxx_ops mv88e6097_ops = {
34813460
.port_pause_limit = mv88e6097_port_pause_limit,
34823461
.port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit,
34833462
.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,
3484-
.port_link_state = mv88e6352_port_link_state,
34853463
.port_get_cmode = mv88e6185_port_get_cmode,
34863464
.port_setup_message_port = mv88e6xxx_setup_message_port,
34873465
.stats_snapshot = mv88e6xxx_g1_stats_snapshot,
@@ -3515,7 +3493,6 @@ static const struct mv88e6xxx_ops mv88e6123_ops = {
35153493
.port_set_egress_floods = mv88e6352_port_set_egress_floods,
35163494
.port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit,
35173495
.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,
3518-
.port_link_state = mv88e6352_port_link_state,
35193496
.port_get_cmode = mv88e6185_port_get_cmode,
35203497
.port_setup_message_port = mv88e6xxx_setup_message_port,
35213498
.stats_snapshot = mv88e6320_g1_stats_snapshot,
@@ -3554,7 +3531,6 @@ static const struct mv88e6xxx_ops mv88e6131_ops = {
35543531
.port_egress_rate_limiting = mv88e6097_port_egress_rate_limiting,
35553532
.port_pause_limit = mv88e6097_port_pause_limit,
35563533
.port_set_pause = mv88e6185_port_set_pause,
3557-
.port_link_state = mv88e6352_port_link_state,
35583534
.port_get_cmode = mv88e6185_port_get_cmode,
35593535
.port_setup_message_port = mv88e6xxx_setup_message_port,
35603536
.stats_snapshot = mv88e6xxx_g1_stats_snapshot,
@@ -3598,7 +3574,6 @@ static const struct mv88e6xxx_ops mv88e6141_ops = {
35983574
.port_pause_limit = mv88e6097_port_pause_limit,
35993575
.port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit,
36003576
.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,
3601-
.port_link_state = mv88e6352_port_link_state,
36023577
.port_get_cmode = mv88e6352_port_get_cmode,
36033578
.port_set_cmode = mv88e6341_port_set_cmode,
36043579
.port_setup_message_port = mv88e6xxx_setup_message_port,
@@ -3648,7 +3623,6 @@ static const struct mv88e6xxx_ops mv88e6161_ops = {
36483623
.port_pause_limit = mv88e6097_port_pause_limit,
36493624
.port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit,
36503625
.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,
3651-
.port_link_state = mv88e6352_port_link_state,
36523626
.port_get_cmode = mv88e6185_port_get_cmode,
36533627
.port_setup_message_port = mv88e6xxx_setup_message_port,
36543628
.stats_snapshot = mv88e6xxx_g1_stats_snapshot,
@@ -3683,7 +3657,6 @@ static const struct mv88e6xxx_ops mv88e6165_ops = {
36833657
.port_set_speed_duplex = mv88e6185_port_set_speed_duplex,
36843658
.port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit,
36853659
.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,
3686-
.port_link_state = mv88e6352_port_link_state,
36873660
.port_get_cmode = mv88e6185_port_get_cmode,
36883661
.port_setup_message_port = mv88e6xxx_setup_message_port,
36893662
.stats_snapshot = mv88e6xxx_g1_stats_snapshot,
@@ -3726,7 +3699,6 @@ static const struct mv88e6xxx_ops mv88e6171_ops = {
37263699
.port_pause_limit = mv88e6097_port_pause_limit,
37273700
.port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit,
37283701
.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,
3729-
.port_link_state = mv88e6352_port_link_state,
37303702
.port_get_cmode = mv88e6352_port_get_cmode,
37313703
.port_setup_message_port = mv88e6xxx_setup_message_port,
37323704
.stats_snapshot = mv88e6320_g1_stats_snapshot,
@@ -3770,7 +3742,6 @@ static const struct mv88e6xxx_ops mv88e6172_ops = {
37703742
.port_pause_limit = mv88e6097_port_pause_limit,
37713743
.port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit,
37723744
.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,
3773-
.port_link_state = mv88e6352_port_link_state,
37743745
.port_get_cmode = mv88e6352_port_get_cmode,
37753746
.port_setup_message_port = mv88e6xxx_setup_message_port,
37763747
.stats_snapshot = mv88e6320_g1_stats_snapshot,
@@ -3821,7 +3792,6 @@ static const struct mv88e6xxx_ops mv88e6175_ops = {
38213792
.port_pause_limit = mv88e6097_port_pause_limit,
38223793
.port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit,
38233794
.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,
3824-
.port_link_state = mv88e6352_port_link_state,
38253795
.port_get_cmode = mv88e6352_port_get_cmode,
38263796
.port_setup_message_port = mv88e6xxx_setup_message_port,
38273797
.stats_snapshot = mv88e6320_g1_stats_snapshot,
@@ -3865,7 +3835,6 @@ static const struct mv88e6xxx_ops mv88e6176_ops = {
38653835
.port_pause_limit = mv88e6097_port_pause_limit,
38663836
.port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit,
38673837
.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,
3868-
.port_link_state = mv88e6352_port_link_state,
38693838
.port_get_cmode = mv88e6352_port_get_cmode,
38703839
.port_setup_message_port = mv88e6xxx_setup_message_port,
38713840
.stats_snapshot = mv88e6320_g1_stats_snapshot,
@@ -3913,7 +3882,6 @@ static const struct mv88e6xxx_ops mv88e6185_ops = {
39133882
.port_egress_rate_limiting = mv88e6095_port_egress_rate_limiting,
39143883
.port_set_upstream_port = mv88e6095_port_set_upstream_port,
39153884
.port_set_pause = mv88e6185_port_set_pause,
3916-
.port_link_state = mv88e6185_port_link_state,
39173885
.port_get_cmode = mv88e6185_port_get_cmode,
39183886
.port_setup_message_port = mv88e6xxx_setup_message_port,
39193887
.stats_snapshot = mv88e6xxx_g1_stats_snapshot,
@@ -3955,7 +3923,6 @@ static const struct mv88e6xxx_ops mv88e6190_ops = {
39553923
.port_pause_limit = mv88e6390_port_pause_limit,
39563924
.port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit,
39573925
.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,
3958-
.port_link_state = mv88e6352_port_link_state,
39593926
.port_get_cmode = mv88e6352_port_get_cmode,
39603927
.port_set_cmode = mv88e6390_port_set_cmode,
39613928
.port_setup_message_port = mv88e6xxx_setup_message_port,
@@ -4015,7 +3982,6 @@ static const struct mv88e6xxx_ops mv88e6190x_ops = {
40153982
.port_pause_limit = mv88e6390_port_pause_limit,
40163983
.port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit,
40173984
.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,
4018-
.port_link_state = mv88e6352_port_link_state,
40193985
.port_get_cmode = mv88e6352_port_get_cmode,
40203986
.port_set_cmode = mv88e6390x_port_set_cmode,
40213987
.port_setup_message_port = mv88e6xxx_setup_message_port,
@@ -4074,7 +4040,6 @@ static const struct mv88e6xxx_ops mv88e6191_ops = {
40744040
.port_pause_limit = mv88e6390_port_pause_limit,
40754041
.port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit,
40764042
.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,
4077-
.port_link_state = mv88e6352_port_link_state,
40784043
.port_get_cmode = mv88e6352_port_get_cmode,
40794044
.port_set_cmode = mv88e6390_port_set_cmode,
40804045
.port_setup_message_port = mv88e6xxx_setup_message_port,
@@ -4137,7 +4102,6 @@ static const struct mv88e6xxx_ops mv88e6240_ops = {
41374102
.port_pause_limit = mv88e6097_port_pause_limit,
41384103
.port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit,
41394104
.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,
4140-
.port_link_state = mv88e6352_port_link_state,
41414105
.port_get_cmode = mv88e6352_port_get_cmode,
41424106
.port_setup_message_port = mv88e6xxx_setup_message_port,
41434107
.stats_snapshot = mv88e6320_g1_stats_snapshot,
@@ -4193,7 +4157,6 @@ static const struct mv88e6xxx_ops mv88e6250_ops = {
41934157
.port_egress_rate_limiting = mv88e6097_port_egress_rate_limiting,
41944158
.port_pause_limit = mv88e6097_port_pause_limit,
41954159
.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,
4196-
.port_link_state = mv88e6250_port_link_state,
41974160
.stats_snapshot = mv88e6320_g1_stats_snapshot,
41984161
.stats_set_histogram = mv88e6095_g1_stats_set_histogram,
41994162
.stats_get_sset_count = mv88e6250_stats_get_sset_count,
@@ -4233,7 +4196,6 @@ static const struct mv88e6xxx_ops mv88e6290_ops = {
42334196
.port_pause_limit = mv88e6390_port_pause_limit,
42344197
.port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit,
42354198
.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,
4236-
.port_link_state = mv88e6352_port_link_state,
42374199
.port_get_cmode = mv88e6352_port_get_cmode,
42384200
.port_set_cmode = mv88e6390_port_set_cmode,
42394201
.port_setup_message_port = mv88e6xxx_setup_message_port,
@@ -4295,7 +4257,6 @@ static const struct mv88e6xxx_ops mv88e6320_ops = {
42954257
.port_pause_limit = mv88e6097_port_pause_limit,
42964258
.port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit,
42974259
.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,
4298-
.port_link_state = mv88e6352_port_link_state,
42994260
.port_get_cmode = mv88e6352_port_get_cmode,
43004261
.port_setup_message_port = mv88e6xxx_setup_message_port,
43014262
.stats_snapshot = mv88e6320_g1_stats_snapshot,
@@ -4338,7 +4299,6 @@ static const struct mv88e6xxx_ops mv88e6321_ops = {
43384299
.port_pause_limit = mv88e6097_port_pause_limit,
43394300
.port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit,
43404301
.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,
4341-
.port_link_state = mv88e6352_port_link_state,
43424302
.port_get_cmode = mv88e6352_port_get_cmode,
43434303
.port_setup_message_port = mv88e6xxx_setup_message_port,
43444304
.stats_snapshot = mv88e6320_g1_stats_snapshot,
@@ -4381,7 +4341,6 @@ static const struct mv88e6xxx_ops mv88e6341_ops = {
43814341
.port_pause_limit = mv88e6097_port_pause_limit,
43824342
.port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit,
43834343
.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,
4384-
.port_link_state = mv88e6352_port_link_state,
43854344
.port_get_cmode = mv88e6352_port_get_cmode,
43864345
.port_set_cmode = mv88e6341_port_set_cmode,
43874346
.port_setup_message_port = mv88e6xxx_setup_message_port,
@@ -4434,7 +4393,6 @@ static const struct mv88e6xxx_ops mv88e6350_ops = {
44344393
.port_pause_limit = mv88e6097_port_pause_limit,
44354394
.port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit,
44364395
.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,
4437-
.port_link_state = mv88e6352_port_link_state,
44384396
.port_get_cmode = mv88e6352_port_get_cmode,
44394397
.port_setup_message_port = mv88e6xxx_setup_message_port,
44404398
.stats_snapshot = mv88e6320_g1_stats_snapshot,
@@ -4475,7 +4433,6 @@ static const struct mv88e6xxx_ops mv88e6351_ops = {
44754433
.port_pause_limit = mv88e6097_port_pause_limit,
44764434
.port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit,
44774435
.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,
4478-
.port_link_state = mv88e6352_port_link_state,
44794436
.port_get_cmode = mv88e6352_port_get_cmode,
44804437
.port_setup_message_port = mv88e6xxx_setup_message_port,
44814438
.stats_snapshot = mv88e6320_g1_stats_snapshot,
@@ -4521,7 +4478,6 @@ static const struct mv88e6xxx_ops mv88e6352_ops = {
45214478
.port_pause_limit = mv88e6097_port_pause_limit,
45224479
.port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit,
45234480
.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,
4524-
.port_link_state = mv88e6352_port_link_state,
45254481
.port_get_cmode = mv88e6352_port_get_cmode,
45264482
.port_setup_message_port = mv88e6xxx_setup_message_port,
45274483
.stats_snapshot = mv88e6320_g1_stats_snapshot,
@@ -4583,7 +4539,6 @@ static const struct mv88e6xxx_ops mv88e6390_ops = {
45834539
.port_pause_limit = mv88e6390_port_pause_limit,
45844540
.port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit,
45854541
.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,
4586-
.port_link_state = mv88e6352_port_link_state,
45874542
.port_get_cmode = mv88e6352_port_get_cmode,
45884543
.port_set_cmode = mv88e6390_port_set_cmode,
45894544
.port_setup_message_port = mv88e6xxx_setup_message_port,
@@ -4647,7 +4602,6 @@ static const struct mv88e6xxx_ops mv88e6390x_ops = {
46474602
.port_pause_limit = mv88e6390_port_pause_limit,
46484603
.port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit,
46494604
.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,
4650-
.port_link_state = mv88e6352_port_link_state,
46514605
.port_get_cmode = mv88e6352_port_get_cmode,
46524606
.port_set_cmode = mv88e6390x_port_set_cmode,
46534607
.port_setup_message_port = mv88e6xxx_setup_message_port,

‎drivers/net/dsa/mv88e6xxx/chip.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -458,9 +458,6 @@ struct mv88e6xxx_ops {
458458
*/
459459
int (*port_set_upstream_port)(struct mv88e6xxx_chip *chip, int port,
460460
int upstream_port);
461-
/* Return the port link state, as required by phylink */
462-
int (*port_link_state)(struct mv88e6xxx_chip *chip, int port,
463-
struct phylink_link_state *state);
464461

465462
/* Snapshot the statistics for a port. The statistics can then
466463
* be read back a leisure but still with a consistent view.

0 commit comments

Comments
 (0)