summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeiner Kallweit <hkallweit1@gmail.com>2017-11-30 17:47:52 -0500
committerDavid S. Miller <davem@davemloft.net>2017-12-01 15:42:21 -0500
commit80274abafc606f611c4ca8d5cebdcec8933835a9 (patch)
tree6b626b49568ccd7e752fc3973d9672d045b39c81
parent00fde79532d66d18cd0b21fdbd515f4b14078ccf (diff)
net: phy: remove generic settings for callbacks config_aneg and read_status from drivers
Remove generic settings for callbacks config_aneg and read_status from drivers. Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/phy/amd.c2
-rw-r--r--drivers/net/phy/at803x.c6
-rw-r--r--drivers/net/phy/bcm-cygnus.c2
-rw-r--r--drivers/net/phy/bcm63xx.c4
-rw-r--r--drivers/net/phy/bcm7xxx.c6
-rw-r--r--drivers/net/phy/broadcom.c30
-rw-r--r--drivers/net/phy/cicada.c4
-rw-r--r--drivers/net/phy/davicom.c5
-rw-r--r--drivers/net/phy/dp83640.c2
-rw-r--r--drivers/net/phy/dp83822.c2
-rw-r--r--drivers/net/phy/dp83848.c2
-rw-r--r--drivers/net/phy/dp83867.c2
-rw-r--r--drivers/net/phy/icplus.c4
-rw-r--r--drivers/net/phy/intel-xway.c12
-rw-r--r--drivers/net/phy/lxt.c5
-rw-r--r--drivers/net/phy/marvell.c9
-rw-r--r--drivers/net/phy/meson-gxl.c2
-rw-r--r--drivers/net/phy/micrel.c24
-rw-r--r--drivers/net/phy/microchip.c1
-rw-r--r--drivers/net/phy/national.c2
-rw-r--r--drivers/net/phy/phy_device.c2
-rw-r--r--drivers/net/phy/qsemi.c2
-rw-r--r--drivers/net/phy/realtek.c12
-rw-r--r--drivers/net/phy/rockchip.c1
-rw-r--r--drivers/net/phy/smsc.c9
-rw-r--r--drivers/net/phy/ste10Xp.c4
-rw-r--r--drivers/net/phy/uPD60620.c1
-rw-r--r--drivers/net/phy/vitesse.c12
28 files changed, 0 insertions, 169 deletions
diff --git a/drivers/net/phy/amd.c b/drivers/net/phy/amd.c
index 18141c022b13..6fe5dc9201d0 100644
--- a/drivers/net/phy/amd.c
+++ b/drivers/net/phy/amd.c
@@ -68,8 +68,6 @@ static struct phy_driver am79c_driver[] = { {
68 .features = PHY_BASIC_FEATURES, 68 .features = PHY_BASIC_FEATURES,
69 .flags = PHY_HAS_INTERRUPT, 69 .flags = PHY_HAS_INTERRUPT,
70 .config_init = am79c_config_init, 70 .config_init = am79c_config_init,
71 .config_aneg = genphy_config_aneg,
72 .read_status = genphy_read_status,
73 .ack_interrupt = am79c_ack_interrupt, 71 .ack_interrupt = am79c_ack_interrupt,
74 .config_intr = am79c_config_intr, 72 .config_intr = am79c_config_intr,
75} }; 73} };
diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
index 5f93e6add563..de7dd6566df7 100644
--- a/drivers/net/phy/at803x.c
+++ b/drivers/net/phy/at803x.c
@@ -408,8 +408,6 @@ static struct phy_driver at803x_driver[] = {
408 .resume = at803x_resume, 408 .resume = at803x_resume,
409 .features = PHY_GBIT_FEATURES, 409 .features = PHY_GBIT_FEATURES,
410 .flags = PHY_HAS_INTERRUPT, 410 .flags = PHY_HAS_INTERRUPT,
411 .config_aneg = genphy_config_aneg,
412 .read_status = genphy_read_status,
413 .ack_interrupt = at803x_ack_interrupt, 411 .ack_interrupt = at803x_ack_interrupt,
414 .config_intr = at803x_config_intr, 412 .config_intr = at803x_config_intr,
415}, { 413}, {
@@ -426,8 +424,6 @@ static struct phy_driver at803x_driver[] = {
426 .resume = at803x_resume, 424 .resume = at803x_resume,
427 .features = PHY_BASIC_FEATURES, 425 .features = PHY_BASIC_FEATURES,
428 .flags = PHY_HAS_INTERRUPT, 426 .flags = PHY_HAS_INTERRUPT,
429 .config_aneg = genphy_config_aneg,
430 .read_status = genphy_read_status,
431 .ack_interrupt = at803x_ack_interrupt, 427 .ack_interrupt = at803x_ack_interrupt,
432 .config_intr = at803x_config_intr, 428 .config_intr = at803x_config_intr,
433}, { 429}, {
@@ -443,8 +439,6 @@ static struct phy_driver at803x_driver[] = {
443 .resume = at803x_resume, 439 .resume = at803x_resume,
444 .features = PHY_GBIT_FEATURES, 440 .features = PHY_GBIT_FEATURES,
445 .flags = PHY_HAS_INTERRUPT, 441 .flags = PHY_HAS_INTERRUPT,
446 .config_aneg = genphy_config_aneg,
447 .read_status = genphy_read_status,
448 .aneg_done = at803x_aneg_done, 442 .aneg_done = at803x_aneg_done,
449 .ack_interrupt = &at803x_ack_interrupt, 443 .ack_interrupt = &at803x_ack_interrupt,
450 .config_intr = &at803x_config_intr, 444 .config_intr = &at803x_config_intr,
diff --git a/drivers/net/phy/bcm-cygnus.c b/drivers/net/phy/bcm-cygnus.c
index 3fe8cc5c177e..6838129839ca 100644
--- a/drivers/net/phy/bcm-cygnus.c
+++ b/drivers/net/phy/bcm-cygnus.c
@@ -136,8 +136,6 @@ static struct phy_driver bcm_cygnus_phy_driver[] = {
136 .name = "Broadcom Cygnus PHY", 136 .name = "Broadcom Cygnus PHY",
137 .features = PHY_GBIT_FEATURES, 137 .features = PHY_GBIT_FEATURES,
138 .config_init = bcm_cygnus_config_init, 138 .config_init = bcm_cygnus_config_init,
139 .config_aneg = genphy_config_aneg,
140 .read_status = genphy_read_status,
141 .ack_interrupt = bcm_phy_ack_intr, 139 .ack_interrupt = bcm_phy_ack_intr,
142 .config_intr = bcm_phy_config_intr, 140 .config_intr = bcm_phy_config_intr,
143 .suspend = genphy_suspend, 141 .suspend = genphy_suspend,
diff --git a/drivers/net/phy/bcm63xx.c b/drivers/net/phy/bcm63xx.c
index b0492ef2cdaa..cf14613745c9 100644
--- a/drivers/net/phy/bcm63xx.c
+++ b/drivers/net/phy/bcm63xx.c
@@ -69,8 +69,6 @@ static struct phy_driver bcm63xx_driver[] = {
69 .features = (PHY_BASIC_FEATURES | SUPPORTED_Pause), 69 .features = (PHY_BASIC_FEATURES | SUPPORTED_Pause),
70 .flags = PHY_HAS_INTERRUPT | PHY_IS_INTERNAL, 70 .flags = PHY_HAS_INTERRUPT | PHY_IS_INTERNAL,
71 .config_init = bcm63xx_config_init, 71 .config_init = bcm63xx_config_init,
72 .config_aneg = genphy_config_aneg,
73 .read_status = genphy_read_status,
74 .ack_interrupt = bcm_phy_ack_intr, 72 .ack_interrupt = bcm_phy_ack_intr,
75 .config_intr = bcm63xx_config_intr, 73 .config_intr = bcm63xx_config_intr,
76}, { 74}, {
@@ -81,8 +79,6 @@ static struct phy_driver bcm63xx_driver[] = {
81 .features = (PHY_BASIC_FEATURES | SUPPORTED_Pause), 79 .features = (PHY_BASIC_FEATURES | SUPPORTED_Pause),
82 .flags = PHY_HAS_INTERRUPT | PHY_IS_INTERNAL, 80 .flags = PHY_HAS_INTERRUPT | PHY_IS_INTERNAL,
83 .config_init = bcm63xx_config_init, 81 .config_init = bcm63xx_config_init,
84 .config_aneg = genphy_config_aneg,
85 .read_status = genphy_read_status,
86 .ack_interrupt = bcm_phy_ack_intr, 82 .ack_interrupt = bcm_phy_ack_intr,
87 .config_intr = bcm63xx_config_intr, 83 .config_intr = bcm63xx_config_intr,
88} }; 84} };
diff --git a/drivers/net/phy/bcm7xxx.c b/drivers/net/phy/bcm7xxx.c
index 8b33f688ac8a..421feb8f92fe 100644
--- a/drivers/net/phy/bcm7xxx.c
+++ b/drivers/net/phy/bcm7xxx.c
@@ -611,8 +611,6 @@ static int bcm7xxx_28nm_probe(struct phy_device *phydev)
611 .features = PHY_GBIT_FEATURES, \ 611 .features = PHY_GBIT_FEATURES, \
612 .flags = PHY_IS_INTERNAL, \ 612 .flags = PHY_IS_INTERNAL, \
613 .config_init = bcm7xxx_28nm_config_init, \ 613 .config_init = bcm7xxx_28nm_config_init, \
614 .config_aneg = genphy_config_aneg, \
615 .read_status = genphy_read_status, \
616 .resume = bcm7xxx_28nm_resume, \ 614 .resume = bcm7xxx_28nm_resume, \
617 .get_tunable = bcm7xxx_28nm_get_tunable, \ 615 .get_tunable = bcm7xxx_28nm_get_tunable, \
618 .set_tunable = bcm7xxx_28nm_set_tunable, \ 616 .set_tunable = bcm7xxx_28nm_set_tunable, \
@@ -630,8 +628,6 @@ static int bcm7xxx_28nm_probe(struct phy_device *phydev)
630 .features = PHY_BASIC_FEATURES, \ 628 .features = PHY_BASIC_FEATURES, \
631 .flags = PHY_IS_INTERNAL, \ 629 .flags = PHY_IS_INTERNAL, \
632 .config_init = bcm7xxx_28nm_ephy_config_init, \ 630 .config_init = bcm7xxx_28nm_ephy_config_init, \
633 .config_aneg = genphy_config_aneg, \
634 .read_status = genphy_read_status, \
635 .resume = bcm7xxx_28nm_ephy_resume, \ 631 .resume = bcm7xxx_28nm_ephy_resume, \
636 .get_sset_count = bcm_phy_get_sset_count, \ 632 .get_sset_count = bcm_phy_get_sset_count, \
637 .get_strings = bcm_phy_get_strings, \ 633 .get_strings = bcm_phy_get_strings, \
@@ -647,8 +643,6 @@ static int bcm7xxx_28nm_probe(struct phy_device *phydev)
647 .features = PHY_BASIC_FEATURES, \ 643 .features = PHY_BASIC_FEATURES, \
648 .flags = PHY_IS_INTERNAL, \ 644 .flags = PHY_IS_INTERNAL, \
649 .config_init = bcm7xxx_config_init, \ 645 .config_init = bcm7xxx_config_init, \
650 .config_aneg = genphy_config_aneg, \
651 .read_status = genphy_read_status, \
652 .suspend = bcm7xxx_suspend, \ 646 .suspend = bcm7xxx_suspend, \
653 .resume = bcm7xxx_config_init, \ 647 .resume = bcm7xxx_config_init, \
654} 648}
diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c
index d7ed69deabfb..e008411a3960 100644
--- a/drivers/net/phy/broadcom.c
+++ b/drivers/net/phy/broadcom.c
@@ -548,8 +548,6 @@ static struct phy_driver broadcom_drivers[] = {
548 .features = PHY_GBIT_FEATURES, 548 .features = PHY_GBIT_FEATURES,
549 .flags = PHY_HAS_INTERRUPT, 549 .flags = PHY_HAS_INTERRUPT,
550 .config_init = bcm54xx_config_init, 550 .config_init = bcm54xx_config_init,
551 .config_aneg = genphy_config_aneg,
552 .read_status = genphy_read_status,
553 .ack_interrupt = bcm_phy_ack_intr, 551 .ack_interrupt = bcm_phy_ack_intr,
554 .config_intr = bcm_phy_config_intr, 552 .config_intr = bcm_phy_config_intr,
555}, { 553}, {
@@ -559,8 +557,6 @@ static struct phy_driver broadcom_drivers[] = {
559 .features = PHY_GBIT_FEATURES, 557 .features = PHY_GBIT_FEATURES,
560 .flags = PHY_HAS_INTERRUPT, 558 .flags = PHY_HAS_INTERRUPT,
561 .config_init = bcm54xx_config_init, 559 .config_init = bcm54xx_config_init,
562 .config_aneg = genphy_config_aneg,
563 .read_status = genphy_read_status,
564 .ack_interrupt = bcm_phy_ack_intr, 560 .ack_interrupt = bcm_phy_ack_intr,
565 .config_intr = bcm_phy_config_intr, 561 .config_intr = bcm_phy_config_intr,
566}, { 562}, {
@@ -570,8 +566,6 @@ static struct phy_driver broadcom_drivers[] = {
570 .features = PHY_GBIT_FEATURES, 566 .features = PHY_GBIT_FEATURES,
571 .flags = PHY_HAS_INTERRUPT, 567 .flags = PHY_HAS_INTERRUPT,
572 .config_init = bcm54xx_config_init, 568 .config_init = bcm54xx_config_init,
573 .config_aneg = genphy_config_aneg,
574 .read_status = genphy_read_status,
575 .ack_interrupt = bcm_phy_ack_intr, 569 .ack_interrupt = bcm_phy_ack_intr,
576 .config_intr = bcm_phy_config_intr, 570 .config_intr = bcm_phy_config_intr,
577}, { 571}, {
@@ -581,8 +575,6 @@ static struct phy_driver broadcom_drivers[] = {
581 .features = PHY_GBIT_FEATURES, 575 .features = PHY_GBIT_FEATURES,
582 .flags = PHY_HAS_INTERRUPT, 576 .flags = PHY_HAS_INTERRUPT,
583 .config_init = bcm54xx_config_init, 577 .config_init = bcm54xx_config_init,
584 .config_aneg = genphy_config_aneg,
585 .read_status = genphy_read_status,
586 .ack_interrupt = bcm_phy_ack_intr, 578 .ack_interrupt = bcm_phy_ack_intr,
587 .config_intr = bcm_phy_config_intr, 579 .config_intr = bcm_phy_config_intr,
588}, { 580}, {
@@ -592,8 +584,6 @@ static struct phy_driver broadcom_drivers[] = {
592 .features = PHY_GBIT_FEATURES, 584 .features = PHY_GBIT_FEATURES,
593 .flags = PHY_HAS_INTERRUPT, 585 .flags = PHY_HAS_INTERRUPT,
594 .config_init = bcm54xx_config_init, 586 .config_init = bcm54xx_config_init,
595 .config_aneg = genphy_config_aneg,
596 .read_status = genphy_read_status,
597 .ack_interrupt = bcm_phy_ack_intr, 587 .ack_interrupt = bcm_phy_ack_intr,
598 .config_intr = bcm_phy_config_intr, 588 .config_intr = bcm_phy_config_intr,
599}, { 589}, {
@@ -603,8 +593,6 @@ static struct phy_driver broadcom_drivers[] = {
603 .features = PHY_GBIT_FEATURES, 593 .features = PHY_GBIT_FEATURES,
604 .flags = PHY_HAS_INTERRUPT, 594 .flags = PHY_HAS_INTERRUPT,
605 .config_init = bcm54xx_config_init, 595 .config_init = bcm54xx_config_init,
606 .config_aneg = genphy_config_aneg,
607 .read_status = genphy_read_status,
608 .ack_interrupt = bcm_phy_ack_intr, 596 .ack_interrupt = bcm_phy_ack_intr,
609 .config_intr = bcm_phy_config_intr, 597 .config_intr = bcm_phy_config_intr,
610}, { 598}, {
@@ -614,8 +602,6 @@ static struct phy_driver broadcom_drivers[] = {
614 .features = PHY_GBIT_FEATURES, 602 .features = PHY_GBIT_FEATURES,
615 .flags = PHY_HAS_INTERRUPT, 603 .flags = PHY_HAS_INTERRUPT,
616 .config_init = bcm54xx_config_init, 604 .config_init = bcm54xx_config_init,
617 .config_aneg = genphy_config_aneg,
618 .read_status = genphy_read_status,
619 .ack_interrupt = bcm_phy_ack_intr, 605 .ack_interrupt = bcm_phy_ack_intr,
620 .config_intr = bcm_phy_config_intr, 606 .config_intr = bcm_phy_config_intr,
621}, { 607}, {
@@ -625,8 +611,6 @@ static struct phy_driver broadcom_drivers[] = {
625 .features = PHY_GBIT_FEATURES, 611 .features = PHY_GBIT_FEATURES,
626 .flags = PHY_HAS_INTERRUPT, 612 .flags = PHY_HAS_INTERRUPT,
627 .config_init = bcm54xx_config_init, 613 .config_init = bcm54xx_config_init,
628 .config_aneg = bcm5481_config_aneg,
629 .read_status = genphy_read_status,
630 .ack_interrupt = bcm_phy_ack_intr, 614 .ack_interrupt = bcm_phy_ack_intr,
631 .config_intr = bcm_phy_config_intr, 615 .config_intr = bcm_phy_config_intr,
632}, { 616}, {
@@ -636,8 +620,6 @@ static struct phy_driver broadcom_drivers[] = {
636 .features = PHY_GBIT_FEATURES, 620 .features = PHY_GBIT_FEATURES,
637 .flags = PHY_HAS_INTERRUPT, 621 .flags = PHY_HAS_INTERRUPT,
638 .config_init = bcm54xx_config_init, 622 .config_init = bcm54xx_config_init,
639 .config_aneg = bcm5481_config_aneg,
640 .read_status = genphy_read_status,
641 .ack_interrupt = bcm_phy_ack_intr, 623 .ack_interrupt = bcm_phy_ack_intr,
642 .config_intr = bcm_phy_config_intr, 624 .config_intr = bcm_phy_config_intr,
643}, { 625}, {
@@ -647,8 +629,6 @@ static struct phy_driver broadcom_drivers[] = {
647 .features = PHY_GBIT_FEATURES, 629 .features = PHY_GBIT_FEATURES,
648 .flags = PHY_HAS_INTERRUPT, 630 .flags = PHY_HAS_INTERRUPT,
649 .config_init = bcm5482_config_init, 631 .config_init = bcm5482_config_init,
650 .config_aneg = genphy_config_aneg,
651 .read_status = bcm5482_read_status,
652 .ack_interrupt = bcm_phy_ack_intr, 632 .ack_interrupt = bcm_phy_ack_intr,
653 .config_intr = bcm_phy_config_intr, 633 .config_intr = bcm_phy_config_intr,
654}, { 634}, {
@@ -658,8 +638,6 @@ static struct phy_driver broadcom_drivers[] = {
658 .features = PHY_GBIT_FEATURES, 638 .features = PHY_GBIT_FEATURES,
659 .flags = PHY_HAS_INTERRUPT, 639 .flags = PHY_HAS_INTERRUPT,
660 .config_init = bcm54xx_config_init, 640 .config_init = bcm54xx_config_init,
661 .config_aneg = genphy_config_aneg,
662 .read_status = genphy_read_status,
663 .ack_interrupt = bcm_phy_ack_intr, 641 .ack_interrupt = bcm_phy_ack_intr,
664 .config_intr = bcm_phy_config_intr, 642 .config_intr = bcm_phy_config_intr,
665}, { 643}, {
@@ -669,8 +647,6 @@ static struct phy_driver broadcom_drivers[] = {
669 .features = PHY_GBIT_FEATURES, 647 .features = PHY_GBIT_FEATURES,
670 .flags = PHY_HAS_INTERRUPT, 648 .flags = PHY_HAS_INTERRUPT,
671 .config_init = bcm54xx_config_init, 649 .config_init = bcm54xx_config_init,
672 .config_aneg = genphy_config_aneg,
673 .read_status = genphy_read_status,
674 .ack_interrupt = bcm_phy_ack_intr, 650 .ack_interrupt = bcm_phy_ack_intr,
675 .config_intr = bcm_phy_config_intr, 651 .config_intr = bcm_phy_config_intr,
676}, { 652}, {
@@ -680,8 +656,6 @@ static struct phy_driver broadcom_drivers[] = {
680 .features = PHY_GBIT_FEATURES, 656 .features = PHY_GBIT_FEATURES,
681 .flags = PHY_HAS_INTERRUPT, 657 .flags = PHY_HAS_INTERRUPT,
682 .config_init = bcm54xx_config_init, 658 .config_init = bcm54xx_config_init,
683 .config_aneg = genphy_config_aneg,
684 .read_status = genphy_read_status,
685 .ack_interrupt = bcm_phy_ack_intr, 659 .ack_interrupt = bcm_phy_ack_intr,
686 .config_intr = bcm_phy_config_intr, 660 .config_intr = bcm_phy_config_intr,
687}, { 661}, {
@@ -691,8 +665,6 @@ static struct phy_driver broadcom_drivers[] = {
691 .features = PHY_BASIC_FEATURES, 665 .features = PHY_BASIC_FEATURES,
692 .flags = PHY_HAS_INTERRUPT, 666 .flags = PHY_HAS_INTERRUPT,
693 .config_init = brcm_fet_config_init, 667 .config_init = brcm_fet_config_init,
694 .config_aneg = genphy_config_aneg,
695 .read_status = genphy_read_status,
696 .ack_interrupt = brcm_fet_ack_interrupt, 668 .ack_interrupt = brcm_fet_ack_interrupt,
697 .config_intr = brcm_fet_config_intr, 669 .config_intr = brcm_fet_config_intr,
698}, { 670}, {
@@ -702,8 +674,6 @@ static struct phy_driver broadcom_drivers[] = {
702 .features = PHY_BASIC_FEATURES, 674 .features = PHY_BASIC_FEATURES,
703 .flags = PHY_HAS_INTERRUPT, 675 .flags = PHY_HAS_INTERRUPT,
704 .config_init = brcm_fet_config_init, 676 .config_init = brcm_fet_config_init,
705 .config_aneg = genphy_config_aneg,
706 .read_status = genphy_read_status,
707 .ack_interrupt = brcm_fet_ack_interrupt, 677 .ack_interrupt = brcm_fet_ack_interrupt,
708 .config_intr = brcm_fet_config_intr, 678 .config_intr = brcm_fet_config_intr,
709} }; 679} };
diff --git a/drivers/net/phy/cicada.c b/drivers/net/phy/cicada.c
index d339c1afea77..c05af00bf4b6 100644
--- a/drivers/net/phy/cicada.c
+++ b/drivers/net/phy/cicada.c
@@ -110,8 +110,6 @@ static struct phy_driver cis820x_driver[] = {
110 .features = PHY_GBIT_FEATURES, 110 .features = PHY_GBIT_FEATURES,
111 .flags = PHY_HAS_INTERRUPT, 111 .flags = PHY_HAS_INTERRUPT,
112 .config_init = &cis820x_config_init, 112 .config_init = &cis820x_config_init,
113 .config_aneg = &genphy_config_aneg,
114 .read_status = &genphy_read_status,
115 .ack_interrupt = &cis820x_ack_interrupt, 113 .ack_interrupt = &cis820x_ack_interrupt,
116 .config_intr = &cis820x_config_intr, 114 .config_intr = &cis820x_config_intr,
117}, { 115}, {
@@ -121,8 +119,6 @@ static struct phy_driver cis820x_driver[] = {
121 .features = PHY_GBIT_FEATURES, 119 .features = PHY_GBIT_FEATURES,
122 .flags = PHY_HAS_INTERRUPT, 120 .flags = PHY_HAS_INTERRUPT,
123 .config_init = &cis820x_config_init, 121 .config_init = &cis820x_config_init,
124 .config_aneg = &genphy_config_aneg,
125 .read_status = &genphy_read_status,
126 .ack_interrupt = &cis820x_ack_interrupt, 122 .ack_interrupt = &cis820x_ack_interrupt,
127 .config_intr = &cis820x_config_intr, 123 .config_intr = &cis820x_config_intr,
128} }; 124} };
diff --git a/drivers/net/phy/davicom.c b/drivers/net/phy/davicom.c
index e28913d9ea7e..5ee99b3b428c 100644
--- a/drivers/net/phy/davicom.c
+++ b/drivers/net/phy/davicom.c
@@ -153,7 +153,6 @@ static struct phy_driver dm91xx_driver[] = {
153 .flags = PHY_HAS_INTERRUPT, 153 .flags = PHY_HAS_INTERRUPT,
154 .config_init = dm9161_config_init, 154 .config_init = dm9161_config_init,
155 .config_aneg = dm9161_config_aneg, 155 .config_aneg = dm9161_config_aneg,
156 .read_status = genphy_read_status,
157 .ack_interrupt = dm9161_ack_interrupt, 156 .ack_interrupt = dm9161_ack_interrupt,
158 .config_intr = dm9161_config_intr, 157 .config_intr = dm9161_config_intr,
159}, { 158}, {
@@ -164,7 +163,6 @@ static struct phy_driver dm91xx_driver[] = {
164 .flags = PHY_HAS_INTERRUPT, 163 .flags = PHY_HAS_INTERRUPT,
165 .config_init = dm9161_config_init, 164 .config_init = dm9161_config_init,
166 .config_aneg = dm9161_config_aneg, 165 .config_aneg = dm9161_config_aneg,
167 .read_status = genphy_read_status,
168 .ack_interrupt = dm9161_ack_interrupt, 166 .ack_interrupt = dm9161_ack_interrupt,
169 .config_intr = dm9161_config_intr, 167 .config_intr = dm9161_config_intr,
170}, { 168}, {
@@ -175,7 +173,6 @@ static struct phy_driver dm91xx_driver[] = {
175 .flags = PHY_HAS_INTERRUPT, 173 .flags = PHY_HAS_INTERRUPT,
176 .config_init = dm9161_config_init, 174 .config_init = dm9161_config_init,
177 .config_aneg = dm9161_config_aneg, 175 .config_aneg = dm9161_config_aneg,
178 .read_status = genphy_read_status,
179 .ack_interrupt = dm9161_ack_interrupt, 176 .ack_interrupt = dm9161_ack_interrupt,
180 .config_intr = dm9161_config_intr, 177 .config_intr = dm9161_config_intr,
181}, { 178}, {
@@ -184,8 +181,6 @@ static struct phy_driver dm91xx_driver[] = {
184 .phy_id_mask = 0x0ffffff0, 181 .phy_id_mask = 0x0ffffff0,
185 .features = PHY_BASIC_FEATURES, 182 .features = PHY_BASIC_FEATURES,
186 .flags = PHY_HAS_INTERRUPT, 183 .flags = PHY_HAS_INTERRUPT,
187 .config_aneg = genphy_config_aneg,
188 .read_status = genphy_read_status,
189 .ack_interrupt = dm9161_ack_interrupt, 184 .ack_interrupt = dm9161_ack_interrupt,
190 .config_intr = dm9161_config_intr, 185 .config_intr = dm9161_config_intr,
191} }; 186} };
diff --git a/drivers/net/phy/dp83640.c b/drivers/net/phy/dp83640.c
index cbd629822f04..654f42d00092 100644
--- a/drivers/net/phy/dp83640.c
+++ b/drivers/net/phy/dp83640.c
@@ -1502,8 +1502,6 @@ static struct phy_driver dp83640_driver = {
1502 .probe = dp83640_probe, 1502 .probe = dp83640_probe,
1503 .remove = dp83640_remove, 1503 .remove = dp83640_remove,
1504 .config_init = dp83640_config_init, 1504 .config_init = dp83640_config_init,
1505 .config_aneg = genphy_config_aneg,
1506 .read_status = genphy_read_status,
1507 .ack_interrupt = dp83640_ack_interrupt, 1505 .ack_interrupt = dp83640_ack_interrupt,
1508 .config_intr = dp83640_config_intr, 1506 .config_intr = dp83640_config_intr,
1509 .ts_info = dp83640_ts_info, 1507 .ts_info = dp83640_ts_info,
diff --git a/drivers/net/phy/dp83822.c b/drivers/net/phy/dp83822.c
index 14335d14e9e4..6e8a2a4f3a6e 100644
--- a/drivers/net/phy/dp83822.c
+++ b/drivers/net/phy/dp83822.c
@@ -325,8 +325,6 @@ static struct phy_driver dp83822_driver[] = {
325 .set_wol = dp83822_set_wol, 325 .set_wol = dp83822_set_wol,
326 .ack_interrupt = dp83822_ack_interrupt, 326 .ack_interrupt = dp83822_ack_interrupt,
327 .config_intr = dp83822_config_intr, 327 .config_intr = dp83822_config_intr,
328 .config_aneg = genphy_config_aneg,
329 .read_status = genphy_read_status,
330 .suspend = dp83822_suspend, 328 .suspend = dp83822_suspend,
331 .resume = dp83822_resume, 329 .resume = dp83822_resume,
332 }, 330 },
diff --git a/drivers/net/phy/dp83848.c b/drivers/net/phy/dp83848.c
index 3966d43c5146..cd09c3af2117 100644
--- a/drivers/net/phy/dp83848.c
+++ b/drivers/net/phy/dp83848.c
@@ -95,8 +95,6 @@ MODULE_DEVICE_TABLE(mdio, dp83848_tbl);
95 .config_init = genphy_config_init, \ 95 .config_init = genphy_config_init, \
96 .suspend = genphy_suspend, \ 96 .suspend = genphy_suspend, \
97 .resume = genphy_resume, \ 97 .resume = genphy_resume, \
98 .config_aneg = genphy_config_aneg, \
99 .read_status = genphy_read_status, \
100 \ 98 \
101 /* IRQ related */ \ 99 /* IRQ related */ \
102 .ack_interrupt = dp83848_ack_interrupt, \ 100 .ack_interrupt = dp83848_ack_interrupt, \
diff --git a/drivers/net/phy/dp83867.c b/drivers/net/phy/dp83867.c
index c1ab976cc800..ab58224f897f 100644
--- a/drivers/net/phy/dp83867.c
+++ b/drivers/net/phy/dp83867.c
@@ -324,8 +324,6 @@ static struct phy_driver dp83867_driver[] = {
324 .ack_interrupt = dp83867_ack_interrupt, 324 .ack_interrupt = dp83867_ack_interrupt,
325 .config_intr = dp83867_config_intr, 325 .config_intr = dp83867_config_intr,
326 326
327 .config_aneg = genphy_config_aneg,
328 .read_status = genphy_read_status,
329 .suspend = genphy_suspend, 327 .suspend = genphy_suspend,
330 .resume = genphy_resume, 328 .resume = genphy_resume,
331 }, 329 },
diff --git a/drivers/net/phy/icplus.c b/drivers/net/phy/icplus.c
index 567280a72241..791587a49215 100644
--- a/drivers/net/phy/icplus.c
+++ b/drivers/net/phy/icplus.c
@@ -227,8 +227,6 @@ static struct phy_driver icplus_driver[] = {
227 .phy_id_mask = 0x0ffffff0, 227 .phy_id_mask = 0x0ffffff0,
228 .features = PHY_GBIT_FEATURES, 228 .features = PHY_GBIT_FEATURES,
229 .config_init = &ip1001_config_init, 229 .config_init = &ip1001_config_init,
230 .config_aneg = &genphy_config_aneg,
231 .read_status = &genphy_read_status,
232 .suspend = genphy_suspend, 230 .suspend = genphy_suspend,
233 .resume = genphy_resume, 231 .resume = genphy_resume,
234}, { 232}, {
@@ -239,8 +237,6 @@ static struct phy_driver icplus_driver[] = {
239 .flags = PHY_HAS_INTERRUPT, 237 .flags = PHY_HAS_INTERRUPT,
240 .ack_interrupt = ip101a_g_ack_interrupt, 238 .ack_interrupt = ip101a_g_ack_interrupt,
241 .config_init = &ip101a_g_config_init, 239 .config_init = &ip101a_g_config_init,
242 .config_aneg = &genphy_config_aneg,
243 .read_status = &genphy_read_status,
244 .suspend = genphy_suspend, 240 .suspend = genphy_suspend,
245 .resume = genphy_resume, 241 .resume = genphy_resume,
246} }; 242} };
diff --git a/drivers/net/phy/intel-xway.c b/drivers/net/phy/intel-xway.c
index 55f8c52dd2f1..a11f80cb5388 100644
--- a/drivers/net/phy/intel-xway.c
+++ b/drivers/net/phy/intel-xway.c
@@ -243,7 +243,6 @@ static struct phy_driver xway_gphy[] = {
243 .flags = PHY_HAS_INTERRUPT, 243 .flags = PHY_HAS_INTERRUPT,
244 .config_init = xway_gphy_config_init, 244 .config_init = xway_gphy_config_init,
245 .config_aneg = xway_gphy14_config_aneg, 245 .config_aneg = xway_gphy14_config_aneg,
246 .read_status = genphy_read_status,
247 .ack_interrupt = xway_gphy_ack_interrupt, 246 .ack_interrupt = xway_gphy_ack_interrupt,
248 .did_interrupt = xway_gphy_did_interrupt, 247 .did_interrupt = xway_gphy_did_interrupt,
249 .config_intr = xway_gphy_config_intr, 248 .config_intr = xway_gphy_config_intr,
@@ -257,7 +256,6 @@ static struct phy_driver xway_gphy[] = {
257 .flags = PHY_HAS_INTERRUPT, 256 .flags = PHY_HAS_INTERRUPT,
258 .config_init = xway_gphy_config_init, 257 .config_init = xway_gphy_config_init,
259 .config_aneg = xway_gphy14_config_aneg, 258 .config_aneg = xway_gphy14_config_aneg,
260 .read_status = genphy_read_status,
261 .ack_interrupt = xway_gphy_ack_interrupt, 259 .ack_interrupt = xway_gphy_ack_interrupt,
262 .did_interrupt = xway_gphy_did_interrupt, 260 .did_interrupt = xway_gphy_did_interrupt,
263 .config_intr = xway_gphy_config_intr, 261 .config_intr = xway_gphy_config_intr,
@@ -271,7 +269,6 @@ static struct phy_driver xway_gphy[] = {
271 .flags = PHY_HAS_INTERRUPT, 269 .flags = PHY_HAS_INTERRUPT,
272 .config_init = xway_gphy_config_init, 270 .config_init = xway_gphy_config_init,
273 .config_aneg = xway_gphy14_config_aneg, 271 .config_aneg = xway_gphy14_config_aneg,
274 .read_status = genphy_read_status,
275 .ack_interrupt = xway_gphy_ack_interrupt, 272 .ack_interrupt = xway_gphy_ack_interrupt,
276 .did_interrupt = xway_gphy_did_interrupt, 273 .did_interrupt = xway_gphy_did_interrupt,
277 .config_intr = xway_gphy_config_intr, 274 .config_intr = xway_gphy_config_intr,
@@ -285,7 +282,6 @@ static struct phy_driver xway_gphy[] = {
285 .flags = PHY_HAS_INTERRUPT, 282 .flags = PHY_HAS_INTERRUPT,
286 .config_init = xway_gphy_config_init, 283 .config_init = xway_gphy_config_init,
287 .config_aneg = xway_gphy14_config_aneg, 284 .config_aneg = xway_gphy14_config_aneg,
288 .read_status = genphy_read_status,
289 .ack_interrupt = xway_gphy_ack_interrupt, 285 .ack_interrupt = xway_gphy_ack_interrupt,
290 .did_interrupt = xway_gphy_did_interrupt, 286 .did_interrupt = xway_gphy_did_interrupt,
291 .config_intr = xway_gphy_config_intr, 287 .config_intr = xway_gphy_config_intr,
@@ -298,8 +294,6 @@ static struct phy_driver xway_gphy[] = {
298 .features = PHY_GBIT_FEATURES, 294 .features = PHY_GBIT_FEATURES,
299 .flags = PHY_HAS_INTERRUPT, 295 .flags = PHY_HAS_INTERRUPT,
300 .config_init = xway_gphy_config_init, 296 .config_init = xway_gphy_config_init,
301 .config_aneg = genphy_config_aneg,
302 .read_status = genphy_read_status,
303 .ack_interrupt = xway_gphy_ack_interrupt, 297 .ack_interrupt = xway_gphy_ack_interrupt,
304 .did_interrupt = xway_gphy_did_interrupt, 298 .did_interrupt = xway_gphy_did_interrupt,
305 .config_intr = xway_gphy_config_intr, 299 .config_intr = xway_gphy_config_intr,
@@ -312,8 +306,6 @@ static struct phy_driver xway_gphy[] = {
312 .features = PHY_BASIC_FEATURES, 306 .features = PHY_BASIC_FEATURES,
313 .flags = PHY_HAS_INTERRUPT, 307 .flags = PHY_HAS_INTERRUPT,
314 .config_init = xway_gphy_config_init, 308 .config_init = xway_gphy_config_init,
315 .config_aneg = genphy_config_aneg,
316 .read_status = genphy_read_status,
317 .ack_interrupt = xway_gphy_ack_interrupt, 309 .ack_interrupt = xway_gphy_ack_interrupt,
318 .did_interrupt = xway_gphy_did_interrupt, 310 .did_interrupt = xway_gphy_did_interrupt,
319 .config_intr = xway_gphy_config_intr, 311 .config_intr = xway_gphy_config_intr,
@@ -326,8 +318,6 @@ static struct phy_driver xway_gphy[] = {
326 .features = PHY_GBIT_FEATURES, 318 .features = PHY_GBIT_FEATURES,
327 .flags = PHY_HAS_INTERRUPT, 319 .flags = PHY_HAS_INTERRUPT,
328 .config_init = xway_gphy_config_init, 320 .config_init = xway_gphy_config_init,
329 .config_aneg = genphy_config_aneg,
330 .read_status = genphy_read_status,
331 .ack_interrupt = xway_gphy_ack_interrupt, 321 .ack_interrupt = xway_gphy_ack_interrupt,
332 .did_interrupt = xway_gphy_did_interrupt, 322 .did_interrupt = xway_gphy_did_interrupt,
333 .config_intr = xway_gphy_config_intr, 323 .config_intr = xway_gphy_config_intr,
@@ -340,8 +330,6 @@ static struct phy_driver xway_gphy[] = {
340 .features = PHY_BASIC_FEATURES, 330 .features = PHY_BASIC_FEATURES,
341 .flags = PHY_HAS_INTERRUPT, 331 .flags = PHY_HAS_INTERRUPT,
342 .config_init = xway_gphy_config_init, 332 .config_init = xway_gphy_config_init,
343 .config_aneg = genphy_config_aneg,
344 .read_status = genphy_read_status,
345 .ack_interrupt = xway_gphy_ack_interrupt, 333 .ack_interrupt = xway_gphy_ack_interrupt,
346 .did_interrupt = xway_gphy_did_interrupt, 334 .did_interrupt = xway_gphy_did_interrupt,
347 .config_intr = xway_gphy_config_intr, 335 .config_intr = xway_gphy_config_intr,
diff --git a/drivers/net/phy/lxt.c b/drivers/net/phy/lxt.c
index 09d215177fff..c14b254b2879 100644
--- a/drivers/net/phy/lxt.c
+++ b/drivers/net/phy/lxt.c
@@ -259,8 +259,6 @@ static struct phy_driver lxt97x_driver[] = {
259 .features = PHY_BASIC_FEATURES, 259 .features = PHY_BASIC_FEATURES,
260 .flags = PHY_HAS_INTERRUPT, 260 .flags = PHY_HAS_INTERRUPT,
261 .config_init = lxt970_config_init, 261 .config_init = lxt970_config_init,
262 .config_aneg = genphy_config_aneg,
263 .read_status = genphy_read_status,
264 .ack_interrupt = lxt970_ack_interrupt, 262 .ack_interrupt = lxt970_ack_interrupt,
265 .config_intr = lxt970_config_intr, 263 .config_intr = lxt970_config_intr,
266}, { 264}, {
@@ -269,8 +267,6 @@ static struct phy_driver lxt97x_driver[] = {
269 .phy_id_mask = 0xfffffff0, 267 .phy_id_mask = 0xfffffff0,
270 .features = PHY_BASIC_FEATURES, 268 .features = PHY_BASIC_FEATURES,
271 .flags = PHY_HAS_INTERRUPT, 269 .flags = PHY_HAS_INTERRUPT,
272 .config_aneg = genphy_config_aneg,
273 .read_status = genphy_read_status,
274 .ack_interrupt = lxt971_ack_interrupt, 270 .ack_interrupt = lxt971_ack_interrupt,
275 .config_intr = lxt971_config_intr, 271 .config_intr = lxt971_config_intr,
276}, { 272}, {
@@ -290,7 +286,6 @@ static struct phy_driver lxt97x_driver[] = {
290 .flags = 0, 286 .flags = 0,
291 .probe = lxt973_probe, 287 .probe = lxt973_probe,
292 .config_aneg = lxt973_config_aneg, 288 .config_aneg = lxt973_config_aneg,
293 .read_status = genphy_read_status,
294} }; 289} };
295 290
296module_phy_driver(lxt97x_driver); 291module_phy_driver(lxt97x_driver);
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index 4d02b27df044..6dbb0f4c34eb 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -1958,7 +1958,6 @@ static struct phy_driver marvell_drivers[] = {
1958 .probe = marvell_probe, 1958 .probe = marvell_probe,
1959 .config_init = &marvell_config_init, 1959 .config_init = &marvell_config_init,
1960 .config_aneg = &m88e1101_config_aneg, 1960 .config_aneg = &m88e1101_config_aneg,
1961 .read_status = &genphy_read_status,
1962 .ack_interrupt = &marvell_ack_interrupt, 1961 .ack_interrupt = &marvell_ack_interrupt,
1963 .config_intr = &marvell_config_intr, 1962 .config_intr = &marvell_config_intr,
1964 .resume = &genphy_resume, 1963 .resume = &genphy_resume,
@@ -1976,7 +1975,6 @@ static struct phy_driver marvell_drivers[] = {
1976 .probe = marvell_probe, 1975 .probe = marvell_probe,
1977 .config_init = &m88e1111_config_init, 1976 .config_init = &m88e1111_config_init,
1978 .config_aneg = &marvell_config_aneg, 1977 .config_aneg = &marvell_config_aneg,
1979 .read_status = &genphy_read_status,
1980 .ack_interrupt = &marvell_ack_interrupt, 1978 .ack_interrupt = &marvell_ack_interrupt,
1981 .config_intr = &marvell_config_intr, 1979 .config_intr = &marvell_config_intr,
1982 .resume = &genphy_resume, 1980 .resume = &genphy_resume,
@@ -2012,7 +2010,6 @@ static struct phy_driver marvell_drivers[] = {
2012 .probe = marvell_probe, 2010 .probe = marvell_probe,
2013 .config_init = &m88e1118_config_init, 2011 .config_init = &m88e1118_config_init,
2014 .config_aneg = &m88e1118_config_aneg, 2012 .config_aneg = &m88e1118_config_aneg,
2015 .read_status = &genphy_read_status,
2016 .ack_interrupt = &marvell_ack_interrupt, 2013 .ack_interrupt = &marvell_ack_interrupt,
2017 .config_intr = &marvell_config_intr, 2014 .config_intr = &marvell_config_intr,
2018 .resume = &genphy_resume, 2015 .resume = &genphy_resume,
@@ -2070,7 +2067,6 @@ static struct phy_driver marvell_drivers[] = {
2070 .probe = marvell_probe, 2067 .probe = marvell_probe,
2071 .config_init = &m88e1145_config_init, 2068 .config_init = &m88e1145_config_init,
2072 .config_aneg = &marvell_config_aneg, 2069 .config_aneg = &marvell_config_aneg,
2073 .read_status = &genphy_read_status,
2074 .ack_interrupt = &marvell_ack_interrupt, 2070 .ack_interrupt = &marvell_ack_interrupt,
2075 .config_intr = &marvell_config_intr, 2071 .config_intr = &marvell_config_intr,
2076 .resume = &genphy_resume, 2072 .resume = &genphy_resume,
@@ -2088,7 +2084,6 @@ static struct phy_driver marvell_drivers[] = {
2088 .probe = marvell_probe, 2084 .probe = marvell_probe,
2089 .config_init = &m88e1149_config_init, 2085 .config_init = &m88e1149_config_init,
2090 .config_aneg = &m88e1118_config_aneg, 2086 .config_aneg = &m88e1118_config_aneg,
2091 .read_status = &genphy_read_status,
2092 .ack_interrupt = &marvell_ack_interrupt, 2087 .ack_interrupt = &marvell_ack_interrupt,
2093 .config_intr = &marvell_config_intr, 2088 .config_intr = &marvell_config_intr,
2094 .resume = &genphy_resume, 2089 .resume = &genphy_resume,
@@ -2106,7 +2101,6 @@ static struct phy_driver marvell_drivers[] = {
2106 .probe = marvell_probe, 2101 .probe = marvell_probe,
2107 .config_init = &m88e1111_config_init, 2102 .config_init = &m88e1111_config_init,
2108 .config_aneg = &marvell_config_aneg, 2103 .config_aneg = &marvell_config_aneg,
2109 .read_status = &genphy_read_status,
2110 .ack_interrupt = &marvell_ack_interrupt, 2104 .ack_interrupt = &marvell_ack_interrupt,
2111 .config_intr = &marvell_config_intr, 2105 .config_intr = &marvell_config_intr,
2112 .resume = &genphy_resume, 2106 .resume = &genphy_resume,
@@ -2123,8 +2117,6 @@ static struct phy_driver marvell_drivers[] = {
2123 .flags = PHY_HAS_INTERRUPT, 2117 .flags = PHY_HAS_INTERRUPT,
2124 .probe = marvell_probe, 2118 .probe = marvell_probe,
2125 .config_init = &m88e1116r_config_init, 2119 .config_init = &m88e1116r_config_init,
2126 .config_aneg = &genphy_config_aneg,
2127 .read_status = &genphy_read_status,
2128 .ack_interrupt = &marvell_ack_interrupt, 2120 .ack_interrupt = &marvell_ack_interrupt,
2129 .config_intr = &marvell_config_intr, 2121 .config_intr = &marvell_config_intr,
2130 .resume = &genphy_resume, 2122 .resume = &genphy_resume,
@@ -2200,7 +2192,6 @@ static struct phy_driver marvell_drivers[] = {
2200 .features = PHY_BASIC_FEATURES, 2192 .features = PHY_BASIC_FEATURES,
2201 .flags = PHY_HAS_INTERRUPT, 2193 .flags = PHY_HAS_INTERRUPT,
2202 .probe = marvell_probe, 2194 .probe = marvell_probe,
2203 .config_aneg = &genphy_config_aneg,
2204 .config_init = &m88e3016_config_init, 2195 .config_init = &m88e3016_config_init,
2205 .aneg_done = &marvell_aneg_done, 2196 .aneg_done = &marvell_aneg_done,
2206 .read_status = &marvell_read_status, 2197 .read_status = &marvell_read_status,
diff --git a/drivers/net/phy/meson-gxl.c b/drivers/net/phy/meson-gxl.c
index 1ea69b7585d9..401e3234be58 100644
--- a/drivers/net/phy/meson-gxl.c
+++ b/drivers/net/phy/meson-gxl.c
@@ -58,9 +58,7 @@ static struct phy_driver meson_gxl_phy[] = {
58 .features = PHY_BASIC_FEATURES, 58 .features = PHY_BASIC_FEATURES,
59 .flags = PHY_IS_INTERNAL, 59 .flags = PHY_IS_INTERNAL,
60 .config_init = meson_gxl_config_init, 60 .config_init = meson_gxl_config_init,
61 .config_aneg = genphy_config_aneg,
62 .aneg_done = genphy_aneg_done, 61 .aneg_done = genphy_aneg_done,
63 .read_status = genphy_read_status,
64 .suspend = genphy_suspend, 62 .suspend = genphy_suspend,
65 .resume = genphy_resume, 63 .resume = genphy_resume,
66 }, 64 },
diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
index fdb43dd9b5cd..cf1c5b1ed508 100644
--- a/drivers/net/phy/micrel.c
+++ b/drivers/net/phy/micrel.c
@@ -799,8 +799,6 @@ static struct phy_driver ksphy_driver[] = {
799 .flags = PHY_HAS_INTERRUPT, 799 .flags = PHY_HAS_INTERRUPT,
800 .driver_data = &ks8737_type, 800 .driver_data = &ks8737_type,
801 .config_init = kszphy_config_init, 801 .config_init = kszphy_config_init,
802 .config_aneg = genphy_config_aneg,
803 .read_status = genphy_read_status,
804 .ack_interrupt = kszphy_ack_interrupt, 802 .ack_interrupt = kszphy_ack_interrupt,
805 .config_intr = kszphy_config_intr, 803 .config_intr = kszphy_config_intr,
806 .suspend = genphy_suspend, 804 .suspend = genphy_suspend,
@@ -814,8 +812,6 @@ static struct phy_driver ksphy_driver[] = {
814 .driver_data = &ksz8021_type, 812 .driver_data = &ksz8021_type,
815 .probe = kszphy_probe, 813 .probe = kszphy_probe,
816 .config_init = kszphy_config_init, 814 .config_init = kszphy_config_init,
817 .config_aneg = genphy_config_aneg,
818 .read_status = genphy_read_status,
819 .ack_interrupt = kszphy_ack_interrupt, 815 .ack_interrupt = kszphy_ack_interrupt,
820 .config_intr = kszphy_config_intr, 816 .config_intr = kszphy_config_intr,
821 .get_sset_count = kszphy_get_sset_count, 817 .get_sset_count = kszphy_get_sset_count,
@@ -832,8 +828,6 @@ static struct phy_driver ksphy_driver[] = {
832 .driver_data = &ksz8021_type, 828 .driver_data = &ksz8021_type,
833 .probe = kszphy_probe, 829 .probe = kszphy_probe,
834 .config_init = kszphy_config_init, 830 .config_init = kszphy_config_init,
835 .config_aneg = genphy_config_aneg,
836 .read_status = genphy_read_status,
837 .ack_interrupt = kszphy_ack_interrupt, 831 .ack_interrupt = kszphy_ack_interrupt,
838 .config_intr = kszphy_config_intr, 832 .config_intr = kszphy_config_intr,
839 .get_sset_count = kszphy_get_sset_count, 833 .get_sset_count = kszphy_get_sset_count,
@@ -851,7 +845,6 @@ static struct phy_driver ksphy_driver[] = {
851 .probe = kszphy_probe, 845 .probe = kszphy_probe,
852 .config_init = ksz8041_config_init, 846 .config_init = ksz8041_config_init,
853 .config_aneg = ksz8041_config_aneg, 847 .config_aneg = ksz8041_config_aneg,
854 .read_status = genphy_read_status,
855 .ack_interrupt = kszphy_ack_interrupt, 848 .ack_interrupt = kszphy_ack_interrupt,
856 .config_intr = kszphy_config_intr, 849 .config_intr = kszphy_config_intr,
857 .get_sset_count = kszphy_get_sset_count, 850 .get_sset_count = kszphy_get_sset_count,
@@ -868,8 +861,6 @@ static struct phy_driver ksphy_driver[] = {
868 .driver_data = &ksz8041_type, 861 .driver_data = &ksz8041_type,
869 .probe = kszphy_probe, 862 .probe = kszphy_probe,
870 .config_init = kszphy_config_init, 863 .config_init = kszphy_config_init,
871 .config_aneg = genphy_config_aneg,
872 .read_status = genphy_read_status,
873 .ack_interrupt = kszphy_ack_interrupt, 864 .ack_interrupt = kszphy_ack_interrupt,
874 .config_intr = kszphy_config_intr, 865 .config_intr = kszphy_config_intr,
875 .get_sset_count = kszphy_get_sset_count, 866 .get_sset_count = kszphy_get_sset_count,
@@ -886,8 +877,6 @@ static struct phy_driver ksphy_driver[] = {
886 .driver_data = &ksz8051_type, 877 .driver_data = &ksz8051_type,
887 .probe = kszphy_probe, 878 .probe = kszphy_probe,
888 .config_init = kszphy_config_init, 879 .config_init = kszphy_config_init,
889 .config_aneg = genphy_config_aneg,
890 .read_status = genphy_read_status,
891 .ack_interrupt = kszphy_ack_interrupt, 880 .ack_interrupt = kszphy_ack_interrupt,
892 .config_intr = kszphy_config_intr, 881 .config_intr = kszphy_config_intr,
893 .get_sset_count = kszphy_get_sset_count, 882 .get_sset_count = kszphy_get_sset_count,
@@ -904,8 +893,6 @@ static struct phy_driver ksphy_driver[] = {
904 .driver_data = &ksz8041_type, 893 .driver_data = &ksz8041_type,
905 .probe = kszphy_probe, 894 .probe = kszphy_probe,
906 .config_init = kszphy_config_init, 895 .config_init = kszphy_config_init,
907 .config_aneg = genphy_config_aneg,
908 .read_status = genphy_read_status,
909 .ack_interrupt = kszphy_ack_interrupt, 896 .ack_interrupt = kszphy_ack_interrupt,
910 .config_intr = kszphy_config_intr, 897 .config_intr = kszphy_config_intr,
911 .get_sset_count = kszphy_get_sset_count, 898 .get_sset_count = kszphy_get_sset_count,
@@ -922,8 +909,6 @@ static struct phy_driver ksphy_driver[] = {
922 .driver_data = &ksz8081_type, 909 .driver_data = &ksz8081_type,
923 .probe = kszphy_probe, 910 .probe = kszphy_probe,
924 .config_init = kszphy_config_init, 911 .config_init = kszphy_config_init,
925 .config_aneg = genphy_config_aneg,
926 .read_status = genphy_read_status,
927 .ack_interrupt = kszphy_ack_interrupt, 912 .ack_interrupt = kszphy_ack_interrupt,
928 .config_intr = kszphy_config_intr, 913 .config_intr = kszphy_config_intr,
929 .get_sset_count = kszphy_get_sset_count, 914 .get_sset_count = kszphy_get_sset_count,
@@ -938,8 +923,6 @@ static struct phy_driver ksphy_driver[] = {
938 .features = PHY_BASIC_FEATURES, 923 .features = PHY_BASIC_FEATURES,
939 .flags = PHY_HAS_INTERRUPT, 924 .flags = PHY_HAS_INTERRUPT,
940 .config_init = kszphy_config_init, 925 .config_init = kszphy_config_init,
941 .config_aneg = genphy_config_aneg,
942 .read_status = genphy_read_status,
943 .ack_interrupt = kszphy_ack_interrupt, 926 .ack_interrupt = kszphy_ack_interrupt,
944 .config_intr = kszphy_config_intr, 927 .config_intr = kszphy_config_intr,
945 .suspend = genphy_suspend, 928 .suspend = genphy_suspend,
@@ -953,8 +936,6 @@ static struct phy_driver ksphy_driver[] = {
953 .driver_data = &ksz9021_type, 936 .driver_data = &ksz9021_type,
954 .probe = kszphy_probe, 937 .probe = kszphy_probe,
955 .config_init = ksz9021_config_init, 938 .config_init = ksz9021_config_init,
956 .config_aneg = genphy_config_aneg,
957 .read_status = genphy_read_status,
958 .ack_interrupt = kszphy_ack_interrupt, 939 .ack_interrupt = kszphy_ack_interrupt,
959 .config_intr = kszphy_config_intr, 940 .config_intr = kszphy_config_intr,
960 .get_sset_count = kszphy_get_sset_count, 941 .get_sset_count = kszphy_get_sset_count,
@@ -973,7 +954,6 @@ static struct phy_driver ksphy_driver[] = {
973 .driver_data = &ksz9021_type, 954 .driver_data = &ksz9021_type,
974 .probe = kszphy_probe, 955 .probe = kszphy_probe,
975 .config_init = ksz9031_config_init, 956 .config_init = ksz9031_config_init,
976 .config_aneg = genphy_config_aneg,
977 .read_status = ksz9031_read_status, 957 .read_status = ksz9031_read_status,
978 .ack_interrupt = kszphy_ack_interrupt, 958 .ack_interrupt = kszphy_ack_interrupt,
979 .config_intr = kszphy_config_intr, 959 .config_intr = kszphy_config_intr,
@@ -998,8 +978,6 @@ static struct phy_driver ksphy_driver[] = {
998 .features = PHY_BASIC_FEATURES, 978 .features = PHY_BASIC_FEATURES,
999 .flags = PHY_HAS_INTERRUPT, 979 .flags = PHY_HAS_INTERRUPT,
1000 .config_init = kszphy_config_init, 980 .config_init = kszphy_config_init,
1001 .config_aneg = genphy_config_aneg,
1002 .read_status = genphy_read_status,
1003 .suspend = genphy_suspend, 981 .suspend = genphy_suspend,
1004 .resume = genphy_resume, 982 .resume = genphy_resume,
1005}, { 983}, {
@@ -1019,8 +997,6 @@ static struct phy_driver ksphy_driver[] = {
1019 .name = "Microchip KSZ9477", 997 .name = "Microchip KSZ9477",
1020 .features = PHY_GBIT_FEATURES, 998 .features = PHY_GBIT_FEATURES,
1021 .config_init = kszphy_config_init, 999 .config_init = kszphy_config_init,
1022 .config_aneg = genphy_config_aneg,
1023 .read_status = genphy_read_status,
1024 .suspend = genphy_suspend, 1000 .suspend = genphy_suspend,
1025 .resume = genphy_resume, 1001 .resume = genphy_resume,
1026} }; 1002} };
diff --git a/drivers/net/phy/microchip.c b/drivers/net/phy/microchip.c
index 37ee856c7680..0f293ef28935 100644
--- a/drivers/net/phy/microchip.c
+++ b/drivers/net/phy/microchip.c
@@ -153,7 +153,6 @@ static struct phy_driver microchip_phy_driver[] = {
153 153
154 .config_init = genphy_config_init, 154 .config_init = genphy_config_init,
155 .config_aneg = lan88xx_config_aneg, 155 .config_aneg = lan88xx_config_aneg,
156 .read_status = genphy_read_status,
157 156
158 .ack_interrupt = lan88xx_phy_ack_interrupt, 157 .ack_interrupt = lan88xx_phy_ack_interrupt,
159 .config_intr = lan88xx_phy_config_intr, 158 .config_intr = lan88xx_phy_config_intr,
diff --git a/drivers/net/phy/national.c b/drivers/net/phy/national.c
index 2addf1d3f619..2b1e336961f9 100644
--- a/drivers/net/phy/national.c
+++ b/drivers/net/phy/national.c
@@ -136,8 +136,6 @@ static struct phy_driver dp83865_driver[] = { {
136 .features = PHY_GBIT_FEATURES, 136 .features = PHY_GBIT_FEATURES,
137 .flags = PHY_HAS_INTERRUPT, 137 .flags = PHY_HAS_INTERRUPT,
138 .config_init = ns_config_init, 138 .config_init = ns_config_init,
139 .config_aneg = genphy_config_aneg,
140 .read_status = genphy_read_status,
141 .ack_interrupt = ns_ack_interrupt, 139 .ack_interrupt = ns_ack_interrupt,
142 .config_intr = ns_config_intr, 140 .config_intr = ns_config_intr,
143} }; 141} };
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 67f25ac29025..8154fb706751 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -1907,9 +1907,7 @@ static struct phy_driver genphy_driver = {
1907 .features = PHY_GBIT_FEATURES | SUPPORTED_MII | 1907 .features = PHY_GBIT_FEATURES | SUPPORTED_MII |
1908 SUPPORTED_AUI | SUPPORTED_FIBRE | 1908 SUPPORTED_AUI | SUPPORTED_FIBRE |
1909 SUPPORTED_BNC, 1909 SUPPORTED_BNC,
1910 .config_aneg = genphy_config_aneg,
1911 .aneg_done = genphy_aneg_done, 1910 .aneg_done = genphy_aneg_done,
1912 .read_status = genphy_read_status,
1913 .suspend = genphy_suspend, 1911 .suspend = genphy_suspend,
1914 .resume = genphy_resume, 1912 .resume = genphy_resume,
1915 .set_loopback = genphy_loopback, 1913 .set_loopback = genphy_loopback,
diff --git a/drivers/net/phy/qsemi.c b/drivers/net/phy/qsemi.c
index dbef8002bc28..889a4dce1648 100644
--- a/drivers/net/phy/qsemi.c
+++ b/drivers/net/phy/qsemi.c
@@ -118,8 +118,6 @@ static struct phy_driver qs6612_driver[] = { {
118 .features = PHY_BASIC_FEATURES, 118 .features = PHY_BASIC_FEATURES,
119 .flags = PHY_HAS_INTERRUPT, 119 .flags = PHY_HAS_INTERRUPT,
120 .config_init = qs6612_config_init, 120 .config_init = qs6612_config_init,
121 .config_aneg = genphy_config_aneg,
122 .read_status = genphy_read_status,
123 .ack_interrupt = qs6612_ack_interrupt, 121 .ack_interrupt = qs6612_ack_interrupt,
124 .config_intr = qs6612_config_intr, 122 .config_intr = qs6612_config_intr,
125} }; 123} };
diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c
index eda0a6e86918..82efbf670c38 100644
--- a/drivers/net/phy/realtek.c
+++ b/drivers/net/phy/realtek.c
@@ -159,16 +159,12 @@ static struct phy_driver realtek_drvs[] = {
159 .phy_id_mask = 0x0000ffff, 159 .phy_id_mask = 0x0000ffff,
160 .features = PHY_BASIC_FEATURES, 160 .features = PHY_BASIC_FEATURES,
161 .flags = PHY_HAS_INTERRUPT, 161 .flags = PHY_HAS_INTERRUPT,
162 .config_aneg = &genphy_config_aneg,
163 .read_status = &genphy_read_status,
164 }, { 162 }, {
165 .phy_id = 0x001cc816, 163 .phy_id = 0x001cc816,
166 .name = "RTL8201F 10/100Mbps Ethernet", 164 .name = "RTL8201F 10/100Mbps Ethernet",
167 .phy_id_mask = 0x001fffff, 165 .phy_id_mask = 0x001fffff,
168 .features = PHY_BASIC_FEATURES, 166 .features = PHY_BASIC_FEATURES,
169 .flags = PHY_HAS_INTERRUPT, 167 .flags = PHY_HAS_INTERRUPT,
170 .config_aneg = &genphy_config_aneg,
171 .read_status = &genphy_read_status,
172 .ack_interrupt = &rtl8201_ack_interrupt, 168 .ack_interrupt = &rtl8201_ack_interrupt,
173 .config_intr = &rtl8201_config_intr, 169 .config_intr = &rtl8201_config_intr,
174 .suspend = genphy_suspend, 170 .suspend = genphy_suspend,
@@ -179,8 +175,6 @@ static struct phy_driver realtek_drvs[] = {
179 .phy_id_mask = 0x001fffff, 175 .phy_id_mask = 0x001fffff,
180 .features = PHY_GBIT_FEATURES, 176 .features = PHY_GBIT_FEATURES,
181 .flags = PHY_HAS_INTERRUPT, 177 .flags = PHY_HAS_INTERRUPT,
182 .config_aneg = &genphy_config_aneg,
183 .read_status = &genphy_read_status,
184 .ack_interrupt = &rtl821x_ack_interrupt, 178 .ack_interrupt = &rtl821x_ack_interrupt,
185 .config_intr = &rtl8211b_config_intr, 179 .config_intr = &rtl8211b_config_intr,
186 }, { 180 }, {
@@ -189,8 +183,6 @@ static struct phy_driver realtek_drvs[] = {
189 .phy_id_mask = 0x001fffff, 183 .phy_id_mask = 0x001fffff,
190 .features = PHY_GBIT_FEATURES, 184 .features = PHY_GBIT_FEATURES,
191 .flags = PHY_HAS_INTERRUPT, 185 .flags = PHY_HAS_INTERRUPT,
192 .config_aneg = genphy_config_aneg,
193 .read_status = genphy_read_status,
194 .ack_interrupt = rtl821x_ack_interrupt, 186 .ack_interrupt = rtl821x_ack_interrupt,
195 .config_intr = rtl8211e_config_intr, 187 .config_intr = rtl8211e_config_intr,
196 .suspend = genphy_suspend, 188 .suspend = genphy_suspend,
@@ -201,8 +193,6 @@ static struct phy_driver realtek_drvs[] = {
201 .phy_id_mask = 0x001fffff, 193 .phy_id_mask = 0x001fffff,
202 .features = PHY_GBIT_FEATURES, 194 .features = PHY_GBIT_FEATURES,
203 .flags = PHY_HAS_INTERRUPT, 195 .flags = PHY_HAS_INTERRUPT,
204 .config_aneg = &genphy_config_aneg,
205 .read_status = &genphy_read_status,
206 .ack_interrupt = &rtl821x_ack_interrupt, 196 .ack_interrupt = &rtl821x_ack_interrupt,
207 .config_intr = &rtl8211e_config_intr, 197 .config_intr = &rtl8211e_config_intr,
208 .suspend = genphy_suspend, 198 .suspend = genphy_suspend,
@@ -213,9 +203,7 @@ static struct phy_driver realtek_drvs[] = {
213 .phy_id_mask = 0x001fffff, 203 .phy_id_mask = 0x001fffff,
214 .features = PHY_GBIT_FEATURES, 204 .features = PHY_GBIT_FEATURES,
215 .flags = PHY_HAS_INTERRUPT, 205 .flags = PHY_HAS_INTERRUPT,
216 .config_aneg = &genphy_config_aneg,
217 .config_init = &rtl8211f_config_init, 206 .config_init = &rtl8211f_config_init,
218 .read_status = &genphy_read_status,
219 .ack_interrupt = &rtl8211f_ack_interrupt, 207 .ack_interrupt = &rtl8211f_ack_interrupt,
220 .config_intr = &rtl8211f_config_intr, 208 .config_intr = &rtl8211f_config_intr,
221 .suspend = genphy_suspend, 209 .suspend = genphy_suspend,
diff --git a/drivers/net/phy/rockchip.c b/drivers/net/phy/rockchip.c
index c092af137056..f1da70b9b55f 100644
--- a/drivers/net/phy/rockchip.c
+++ b/drivers/net/phy/rockchip.c
@@ -213,7 +213,6 @@ static struct phy_driver rockchip_phy_driver[] = {
213 .soft_reset = genphy_soft_reset, 213 .soft_reset = genphy_soft_reset,
214 .config_init = rockchip_integrated_phy_config_init, 214 .config_init = rockchip_integrated_phy_config_init,
215 .config_aneg = rockchip_config_aneg, 215 .config_aneg = rockchip_config_aneg,
216 .read_status = genphy_read_status,
217 .suspend = genphy_suspend, 216 .suspend = genphy_suspend,
218 .resume = rockchip_phy_resume, 217 .resume = rockchip_phy_resume,
219}, 218},
diff --git a/drivers/net/phy/smsc.c b/drivers/net/phy/smsc.c
index 2306bfae057f..a1961ba87e2b 100644
--- a/drivers/net/phy/smsc.c
+++ b/drivers/net/phy/smsc.c
@@ -227,8 +227,6 @@ static struct phy_driver smsc_phy_driver[] = {
227 .probe = smsc_phy_probe, 227 .probe = smsc_phy_probe,
228 228
229 /* basic functions */ 229 /* basic functions */
230 .config_aneg = genphy_config_aneg,
231 .read_status = genphy_read_status,
232 .config_init = smsc_phy_config_init, 230 .config_init = smsc_phy_config_init,
233 .soft_reset = smsc_phy_reset, 231 .soft_reset = smsc_phy_reset,
234 232
@@ -249,8 +247,6 @@ static struct phy_driver smsc_phy_driver[] = {
249 .probe = smsc_phy_probe, 247 .probe = smsc_phy_probe,
250 248
251 /* basic functions */ 249 /* basic functions */
252 .config_aneg = genphy_config_aneg,
253 .read_status = genphy_read_status,
254 .config_init = smsc_phy_config_init, 250 .config_init = smsc_phy_config_init,
255 .soft_reset = smsc_phy_reset, 251 .soft_reset = smsc_phy_reset,
256 252
@@ -276,7 +272,6 @@ static struct phy_driver smsc_phy_driver[] = {
276 .probe = smsc_phy_probe, 272 .probe = smsc_phy_probe,
277 273
278 /* basic functions */ 274 /* basic functions */
279 .config_aneg = genphy_config_aneg,
280 .read_status = lan87xx_read_status, 275 .read_status = lan87xx_read_status,
281 .config_init = smsc_phy_config_init, 276 .config_init = smsc_phy_config_init,
282 .soft_reset = smsc_phy_reset, 277 .soft_reset = smsc_phy_reset,
@@ -303,8 +298,6 @@ static struct phy_driver smsc_phy_driver[] = {
303 .probe = smsc_phy_probe, 298 .probe = smsc_phy_probe,
304 299
305 /* basic functions */ 300 /* basic functions */
306 .config_aneg = genphy_config_aneg,
307 .read_status = genphy_read_status,
308 .config_init = lan911x_config_init, 301 .config_init = lan911x_config_init,
309 302
310 /* IRQ related */ 303 /* IRQ related */
@@ -324,7 +317,6 @@ static struct phy_driver smsc_phy_driver[] = {
324 .probe = smsc_phy_probe, 317 .probe = smsc_phy_probe,
325 318
326 /* basic functions */ 319 /* basic functions */
327 .config_aneg = genphy_config_aneg,
328 .read_status = lan87xx_read_status, 320 .read_status = lan87xx_read_status,
329 .config_init = smsc_phy_config_init, 321 .config_init = smsc_phy_config_init,
330 .soft_reset = smsc_phy_reset, 322 .soft_reset = smsc_phy_reset,
@@ -351,7 +343,6 @@ static struct phy_driver smsc_phy_driver[] = {
351 .probe = smsc_phy_probe, 343 .probe = smsc_phy_probe,
352 344
353 /* basic functions */ 345 /* basic functions */
354 .config_aneg = genphy_config_aneg,
355 .read_status = lan87xx_read_status, 346 .read_status = lan87xx_read_status,
356 .config_init = smsc_phy_config_init, 347 .config_init = smsc_phy_config_init,
357 .soft_reset = smsc_phy_reset, 348 .soft_reset = smsc_phy_reset,
diff --git a/drivers/net/phy/ste10Xp.c b/drivers/net/phy/ste10Xp.c
index d00cfb64529e..fbd548a1ad84 100644
--- a/drivers/net/phy/ste10Xp.c
+++ b/drivers/net/phy/ste10Xp.c
@@ -89,8 +89,6 @@ static struct phy_driver ste10xp_pdriver[] = {
89 .features = PHY_BASIC_FEATURES | SUPPORTED_Pause, 89 .features = PHY_BASIC_FEATURES | SUPPORTED_Pause,
90 .flags = PHY_HAS_INTERRUPT, 90 .flags = PHY_HAS_INTERRUPT,
91 .config_init = ste10Xp_config_init, 91 .config_init = ste10Xp_config_init,
92 .config_aneg = genphy_config_aneg,
93 .read_status = genphy_read_status,
94 .ack_interrupt = ste10Xp_ack_interrupt, 92 .ack_interrupt = ste10Xp_ack_interrupt,
95 .config_intr = ste10Xp_config_intr, 93 .config_intr = ste10Xp_config_intr,
96 .suspend = genphy_suspend, 94 .suspend = genphy_suspend,
@@ -102,8 +100,6 @@ static struct phy_driver ste10xp_pdriver[] = {
102 .features = PHY_BASIC_FEATURES | SUPPORTED_Pause, 100 .features = PHY_BASIC_FEATURES | SUPPORTED_Pause,
103 .flags = PHY_HAS_INTERRUPT, 101 .flags = PHY_HAS_INTERRUPT,
104 .config_init = ste10Xp_config_init, 102 .config_init = ste10Xp_config_init,
105 .config_aneg = genphy_config_aneg,
106 .read_status = genphy_read_status,
107 .ack_interrupt = ste10Xp_ack_interrupt, 103 .ack_interrupt = ste10Xp_ack_interrupt,
108 .config_intr = ste10Xp_config_intr, 104 .config_intr = ste10Xp_config_intr,
109 .suspend = genphy_suspend, 105 .suspend = genphy_suspend,
diff --git a/drivers/net/phy/uPD60620.c b/drivers/net/phy/uPD60620.c
index 96b33475ea5e..55f48ee3595a 100644
--- a/drivers/net/phy/uPD60620.c
+++ b/drivers/net/phy/uPD60620.c
@@ -95,7 +95,6 @@ static struct phy_driver upd60620_driver[1] = { {
95 .features = PHY_BASIC_FEATURES, 95 .features = PHY_BASIC_FEATURES,
96 .flags = 0, 96 .flags = 0,
97 .config_init = upd60620_config_init, 97 .config_init = upd60620_config_init,
98 .config_aneg = genphy_config_aneg,
99 .read_status = upd60620_read_status, 98 .read_status = upd60620_read_status,
100} }; 99} };
101 100
diff --git a/drivers/net/phy/vitesse.c b/drivers/net/phy/vitesse.c
index f78ff0279648..d9dd8fbfffc7 100644
--- a/drivers/net/phy/vitesse.c
+++ b/drivers/net/phy/vitesse.c
@@ -267,7 +267,6 @@ static struct phy_driver vsc82xx_driver[] = {
267 .flags = PHY_HAS_INTERRUPT, 267 .flags = PHY_HAS_INTERRUPT,
268 .config_init = &vsc824x_config_init, 268 .config_init = &vsc824x_config_init,
269 .config_aneg = &vsc82x4_config_aneg, 269 .config_aneg = &vsc82x4_config_aneg,
270 .read_status = &genphy_read_status,
271 .ack_interrupt = &vsc824x_ack_interrupt, 270 .ack_interrupt = &vsc824x_ack_interrupt,
272 .config_intr = &vsc82xx_config_intr, 271 .config_intr = &vsc82xx_config_intr,
273}, { 272}, {
@@ -278,7 +277,6 @@ static struct phy_driver vsc82xx_driver[] = {
278 .flags = PHY_HAS_INTERRUPT, 277 .flags = PHY_HAS_INTERRUPT,
279 .config_init = &vsc824x_config_init, 278 .config_init = &vsc824x_config_init,
280 .config_aneg = &vsc82x4_config_aneg, 279 .config_aneg = &vsc82x4_config_aneg,
281 .read_status = &genphy_read_status,
282 .ack_interrupt = &vsc824x_ack_interrupt, 280 .ack_interrupt = &vsc824x_ack_interrupt,
283 .config_intr = &vsc82xx_config_intr, 281 .config_intr = &vsc82xx_config_intr,
284}, { 282}, {
@@ -289,7 +287,6 @@ static struct phy_driver vsc82xx_driver[] = {
289 .flags = PHY_HAS_INTERRUPT, 287 .flags = PHY_HAS_INTERRUPT,
290 .config_init = &vsc824x_config_init, 288 .config_init = &vsc824x_config_init,
291 .config_aneg = &vsc82x4_config_aneg, 289 .config_aneg = &vsc82x4_config_aneg,
292 .read_status = &genphy_read_status,
293 .ack_interrupt = &vsc824x_ack_interrupt, 290 .ack_interrupt = &vsc824x_ack_interrupt,
294 .config_intr = &vsc82xx_config_intr, 291 .config_intr = &vsc82xx_config_intr,
295}, { 292}, {
@@ -300,7 +297,6 @@ static struct phy_driver vsc82xx_driver[] = {
300 .flags = PHY_HAS_INTERRUPT, 297 .flags = PHY_HAS_INTERRUPT,
301 .config_init = &vsc824x_config_init, 298 .config_init = &vsc824x_config_init,
302 .config_aneg = &vsc82x4_config_aneg, 299 .config_aneg = &vsc82x4_config_aneg,
303 .read_status = &genphy_read_status,
304 .ack_interrupt = &vsc824x_ack_interrupt, 300 .ack_interrupt = &vsc824x_ack_interrupt,
305 .config_intr = &vsc82xx_config_intr, 301 .config_intr = &vsc82xx_config_intr,
306}, { 302}, {
@@ -311,7 +307,6 @@ static struct phy_driver vsc82xx_driver[] = {
311 .flags = PHY_HAS_INTERRUPT, 307 .flags = PHY_HAS_INTERRUPT,
312 .config_init = &vsc824x_config_init, 308 .config_init = &vsc824x_config_init,
313 .config_aneg = &vsc82x4_config_aneg, 309 .config_aneg = &vsc82x4_config_aneg,
314 .read_status = &genphy_read_status,
315 .ack_interrupt = &vsc824x_ack_interrupt, 310 .ack_interrupt = &vsc824x_ack_interrupt,
316 .config_intr = &vsc82xx_config_intr, 311 .config_intr = &vsc82xx_config_intr,
317}, { 312}, {
@@ -321,8 +316,6 @@ static struct phy_driver vsc82xx_driver[] = {
321 .features = PHY_GBIT_FEATURES, 316 .features = PHY_GBIT_FEATURES,
322 .flags = PHY_HAS_INTERRUPT, 317 .flags = PHY_HAS_INTERRUPT,
323 .config_init = &vsc8601_config_init, 318 .config_init = &vsc8601_config_init,
324 .config_aneg = &genphy_config_aneg,
325 .read_status = &genphy_read_status,
326 .ack_interrupt = &vsc824x_ack_interrupt, 319 .ack_interrupt = &vsc824x_ack_interrupt,
327 .config_intr = &vsc82xx_config_intr, 320 .config_intr = &vsc82xx_config_intr,
328}, { 321}, {
@@ -333,7 +326,6 @@ static struct phy_driver vsc82xx_driver[] = {
333 .flags = PHY_HAS_INTERRUPT, 326 .flags = PHY_HAS_INTERRUPT,
334 .config_init = &vsc824x_config_init, 327 .config_init = &vsc824x_config_init,
335 .config_aneg = &vsc82x4_config_aneg, 328 .config_aneg = &vsc82x4_config_aneg,
336 .read_status = &genphy_read_status,
337 .ack_interrupt = &vsc824x_ack_interrupt, 329 .ack_interrupt = &vsc824x_ack_interrupt,
338 .config_intr = &vsc82xx_config_intr, 330 .config_intr = &vsc82xx_config_intr,
339}, { 331}, {
@@ -344,8 +336,6 @@ static struct phy_driver vsc82xx_driver[] = {
344 .features = PHY_GBIT_FEATURES, 336 .features = PHY_GBIT_FEATURES,
345 .flags = PHY_HAS_INTERRUPT, 337 .flags = PHY_HAS_INTERRUPT,
346 .config_init = &vsc8221_config_init, 338 .config_init = &vsc8221_config_init,
347 .config_aneg = &genphy_config_aneg,
348 .read_status = &genphy_read_status,
349 .ack_interrupt = &vsc824x_ack_interrupt, 339 .ack_interrupt = &vsc824x_ack_interrupt,
350 .config_intr = &vsc82xx_config_intr, 340 .config_intr = &vsc82xx_config_intr,
351}, { 341}, {
@@ -356,8 +346,6 @@ static struct phy_driver vsc82xx_driver[] = {
356 .features = PHY_GBIT_FEATURES, 346 .features = PHY_GBIT_FEATURES,
357 .flags = PHY_HAS_INTERRUPT, 347 .flags = PHY_HAS_INTERRUPT,
358 .config_init = &vsc8221_config_init, 348 .config_init = &vsc8221_config_init,
359 .config_aneg = &genphy_config_aneg,
360 .read_status = &genphy_read_status,
361 .ack_interrupt = &vsc824x_ack_interrupt, 349 .ack_interrupt = &vsc824x_ack_interrupt,
362 .config_intr = &vsc82xx_config_intr, 350 .config_intr = &vsc82xx_config_intr,
363} }; 351} };