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 <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/phy/aquantia_main.c b/drivers/net/phy/aquantia_main.c
index b7133c3f7437f3b6997bee3296277ff41abce8b8..eed4fe3d871f2c477555f6f4eb8d8be6f5e73c48 100644 (file)
--- a/drivers/net/phy/aquantia_main.c
+++ b/drivers/net/phy/aquantia_main.c
@@ -598,8 +598,6 @@ static struct phy_driver aqr_driver[] = {
 {
        PHY_ID_MATCH_MODEL(PHY_ID_AQ1202),
        .name           = "Aquantia AQ1202",
-       .aneg_done      = genphy_c45_aneg_done,
-       .get_features   = genphy_c45_pma_read_abilities,
        .config_aneg    = aqr_config_aneg,
        .config_intr    = aqr_config_intr,
        .ack_interrupt  = aqr_ack_interrupt,
@@ -608,8 +606,6 @@ static struct phy_driver aqr_driver[] = {
 {
        PHY_ID_MATCH_MODEL(PHY_ID_AQ2104),
        .name           = "Aquantia AQ2104",
-       .aneg_done      = genphy_c45_aneg_done,
-       .get_features   = genphy_c45_pma_read_abilities,
        .config_aneg    = aqr_config_aneg,
        .config_intr    = aqr_config_intr,
        .ack_interrupt  = aqr_ack_interrupt,
@@ -618,8 +614,6 @@ static struct phy_driver aqr_driver[] = {
 {
        PHY_ID_MATCH_MODEL(PHY_ID_AQR105),
        .name           = "Aquantia AQR105",
-       .aneg_done      = genphy_c45_aneg_done,
-       .get_features   = genphy_c45_pma_read_abilities,
        .config_aneg    = aqr_config_aneg,
        .config_intr    = aqr_config_intr,
        .ack_interrupt  = aqr_ack_interrupt,
@@ -628,8 +622,6 @@ static struct phy_driver aqr_driver[] = {
 {
        PHY_ID_MATCH_MODEL(PHY_ID_AQR106),
        .name           = "Aquantia AQR106",
-       .aneg_done      = genphy_c45_aneg_done,
-       .get_features   = genphy_c45_pma_read_abilities,
        .config_aneg    = aqr_config_aneg,
        .config_intr    = aqr_config_intr,
        .ack_interrupt  = aqr_ack_interrupt,
@@ -638,8 +630,6 @@ static struct phy_driver aqr_driver[] = {
 {
        PHY_ID_MATCH_MODEL(PHY_ID_AQR107),
        .name           = "Aquantia AQR107",
-       .aneg_done      = genphy_c45_aneg_done,
-       .get_features   = genphy_c45_pma_read_abilities,
        .probe          = aqr107_probe,
        .config_init    = aqr107_config_init,
        .config_aneg    = aqr_config_aneg,
@@ -658,8 +648,6 @@ static struct phy_driver aqr_driver[] = {
 {
        PHY_ID_MATCH_MODEL(PHY_ID_AQCS109),
        .name           = "Aquantia AQCS109",
-       .aneg_done      = genphy_c45_aneg_done,
-       .get_features   = genphy_c45_pma_read_abilities,
        .probe          = aqr107_probe,
        .config_init    = aqcs109_config_init,
        .config_aneg    = aqr_config_aneg,
@@ -678,8 +666,6 @@ static struct phy_driver aqr_driver[] = {
 {
        PHY_ID_MATCH_MODEL(PHY_ID_AQR405),
        .name           = "Aquantia AQR405",
-       .aneg_done      = genphy_c45_aneg_done,
-       .get_features   = genphy_c45_pma_read_abilities,
        .config_aneg    = aqr_config_aneg,
        .config_intr    = aqr_config_intr,
        .ack_interrupt  = aqr_ack_interrupt,

diff --git a/drivers/net/phy/marvell10g.c b/drivers/net/phy/marvell10g.c
index fc06e8c9a64bbe877bc07a72d2162f26a4886939..238a20e13d6abfbf9e6cfa61033b6153eff28de5 100644 (file)
--- a/drivers/net/phy/marvell10g.c
+++ b/drivers/net/phy/marvell10g.c
@@ -482,7 +482,6 @@ static struct phy_driver mv3310_drivers[] = {
                .phy_id         = MARVELL_PHY_ID_88E2110,
                .phy_id_mask    = MARVELL_PHY_ID_MASK,
                .name           = "mv88x2110",
-               .get_features   = genphy_c45_pma_read_abilities,
                .probe          = mv3310_probe,
                .suspend        = mv3310_suspend,
                .resume         = mv3310_resume,