tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

net: phy: aquantia: Utilize genphy_c45_aneg_done()

The driver duplicates what the generic function does, so use the generic
function intead.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>

authored by

Florian Fainelli and committed by
David S. Miller 6ed33d3a 5697b3e1

+6 -14
+6 -14
drivers/net/phy/aquantia.c
··· 38 38 return 0; 39 39 } 40 40 41 - static int aquantia_aneg_done(struct phy_device *phydev) 42 - { 43 - int reg; 44 - 45 - reg = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_STAT1); 46 - return (reg < 0) ? reg : (reg & BMSR_ANEGCOMPLETE); 47 - } 48 - 49 41 static int aquantia_config_intr(struct phy_device *phydev) 50 42 { 51 43 int err; ··· 117 125 .name = "Aquantia AQ1202", 118 126 .features = PHY_AQUANTIA_FEATURES, 119 127 .flags = PHY_HAS_INTERRUPT, 120 - .aneg_done = aquantia_aneg_done, 128 + .aneg_done = genphy_c45_aneg_done, 121 129 .config_aneg = aquantia_config_aneg, 122 130 .config_intr = aquantia_config_intr, 123 131 .ack_interrupt = aquantia_ack_interrupt, ··· 129 137 .name = "Aquantia AQ2104", 130 138 .features = PHY_AQUANTIA_FEATURES, 131 139 .flags = PHY_HAS_INTERRUPT, 132 - .aneg_done = aquantia_aneg_done, 140 + .aneg_done = genphy_c45_aneg_done, 133 141 .config_aneg = aquantia_config_aneg, 134 142 .config_intr = aquantia_config_intr, 135 143 .ack_interrupt = aquantia_ack_interrupt, ··· 141 149 .name = "Aquantia AQR105", 142 150 .features = PHY_AQUANTIA_FEATURES, 143 151 .flags = PHY_HAS_INTERRUPT, 144 - .aneg_done = aquantia_aneg_done, 152 + .aneg_done = genphy_c45_aneg_done, 145 153 .config_aneg = aquantia_config_aneg, 146 154 .config_intr = aquantia_config_intr, 147 155 .ack_interrupt = aquantia_ack_interrupt, ··· 153 161 .name = "Aquantia AQR106", 154 162 .features = PHY_AQUANTIA_FEATURES, 155 163 .flags = PHY_HAS_INTERRUPT, 156 - .aneg_done = aquantia_aneg_done, 164 + .aneg_done = genphy_c45_aneg_done, 157 165 .config_aneg = aquantia_config_aneg, 158 166 .config_intr = aquantia_config_intr, 159 167 .ack_interrupt = aquantia_ack_interrupt, ··· 165 173 .name = "Aquantia AQR107", 166 174 .features = PHY_AQUANTIA_FEATURES, 167 175 .flags = PHY_HAS_INTERRUPT, 168 - .aneg_done = aquantia_aneg_done, 176 + .aneg_done = genphy_c45_aneg_done, 169 177 .config_aneg = aquantia_config_aneg, 170 178 .config_intr = aquantia_config_intr, 171 179 .ack_interrupt = aquantia_ack_interrupt, ··· 177 185 .name = "Aquantia AQR405", 178 186 .features = PHY_AQUANTIA_FEATURES, 179 187 .flags = PHY_HAS_INTERRUPT, 180 - .aneg_done = aquantia_aneg_done, 188 + .aneg_done = genphy_c45_aneg_done, 181 189 .config_aneg = aquantia_config_aneg, 182 190 .config_intr = aquantia_config_intr, 183 191 .ack_interrupt = aquantia_ack_interrupt,