Skip to content

Commit 4c75be0

Browse files
hkallweitdavem330
authored andcommitted
net: phy: remove unnecessary callback settings in C45 drivers
genphy_c45_aneg_done() is used by phylib as fallback for c45 PHY's if callback aneg_done isn't defined. So we don't have to set this explicitly. Same for genphy_c45_pma_read_abilities(). Signed-off-by: Heiner Kallweit <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 0c9381d commit 4c75be0

File tree

2 files changed

+0
-15
lines changed

2 files changed

+0
-15
lines changed

drivers/net/phy/aquantia_main.c

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -598,8 +598,6 @@ static struct phy_driver aqr_driver[] = {
598598
{
599599
PHY_ID_MATCH_MODEL(PHY_ID_AQ1202),
600600
.name = "Aquantia AQ1202",
601-
.aneg_done = genphy_c45_aneg_done,
602-
.get_features = genphy_c45_pma_read_abilities,
603601
.config_aneg = aqr_config_aneg,
604602
.config_intr = aqr_config_intr,
605603
.ack_interrupt = aqr_ack_interrupt,
@@ -608,8 +606,6 @@ static struct phy_driver aqr_driver[] = {
608606
{
609607
PHY_ID_MATCH_MODEL(PHY_ID_AQ2104),
610608
.name = "Aquantia AQ2104",
611-
.aneg_done = genphy_c45_aneg_done,
612-
.get_features = genphy_c45_pma_read_abilities,
613609
.config_aneg = aqr_config_aneg,
614610
.config_intr = aqr_config_intr,
615611
.ack_interrupt = aqr_ack_interrupt,
@@ -618,8 +614,6 @@ static struct phy_driver aqr_driver[] = {
618614
{
619615
PHY_ID_MATCH_MODEL(PHY_ID_AQR105),
620616
.name = "Aquantia AQR105",
621-
.aneg_done = genphy_c45_aneg_done,
622-
.get_features = genphy_c45_pma_read_abilities,
623617
.config_aneg = aqr_config_aneg,
624618
.config_intr = aqr_config_intr,
625619
.ack_interrupt = aqr_ack_interrupt,
@@ -628,8 +622,6 @@ static struct phy_driver aqr_driver[] = {
628622
{
629623
PHY_ID_MATCH_MODEL(PHY_ID_AQR106),
630624
.name = "Aquantia AQR106",
631-
.aneg_done = genphy_c45_aneg_done,
632-
.get_features = genphy_c45_pma_read_abilities,
633625
.config_aneg = aqr_config_aneg,
634626
.config_intr = aqr_config_intr,
635627
.ack_interrupt = aqr_ack_interrupt,
@@ -638,8 +630,6 @@ static struct phy_driver aqr_driver[] = {
638630
{
639631
PHY_ID_MATCH_MODEL(PHY_ID_AQR107),
640632
.name = "Aquantia AQR107",
641-
.aneg_done = genphy_c45_aneg_done,
642-
.get_features = genphy_c45_pma_read_abilities,
643633
.probe = aqr107_probe,
644634
.config_init = aqr107_config_init,
645635
.config_aneg = aqr_config_aneg,
@@ -658,8 +648,6 @@ static struct phy_driver aqr_driver[] = {
658648
{
659649
PHY_ID_MATCH_MODEL(PHY_ID_AQCS109),
660650
.name = "Aquantia AQCS109",
661-
.aneg_done = genphy_c45_aneg_done,
662-
.get_features = genphy_c45_pma_read_abilities,
663651
.probe = aqr107_probe,
664652
.config_init = aqcs109_config_init,
665653
.config_aneg = aqr_config_aneg,
@@ -678,8 +666,6 @@ static struct phy_driver aqr_driver[] = {
678666
{
679667
PHY_ID_MATCH_MODEL(PHY_ID_AQR405),
680668
.name = "Aquantia AQR405",
681-
.aneg_done = genphy_c45_aneg_done,
682-
.get_features = genphy_c45_pma_read_abilities,
683669
.config_aneg = aqr_config_aneg,
684670
.config_intr = aqr_config_intr,
685671
.ack_interrupt = aqr_ack_interrupt,

drivers/net/phy/marvell10g.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,6 @@ static struct phy_driver mv3310_drivers[] = {
482482
.phy_id = MARVELL_PHY_ID_88E2110,
483483
.phy_id_mask = MARVELL_PHY_ID_MASK,
484484
.name = "mv88x2110",
485-
.get_features = genphy_c45_pma_read_abilities,
486485
.probe = mv3310_probe,
487486
.suspend = mv3310_suspend,
488487
.resume = mv3310_resume,

0 commit comments

Comments
 (0)