Skip to content

L
linux
Commit 1b86f702 authored by Andrew Lunn's avatar Andrew Lunn Committed by David S. Miller
Browse files
Options

net: phy: Remove residual magic from PHY drivers 

commit fa8cddaf ("net phylib: Remove unnecessary condition check in phy")
removed the only place where the PHY flag PHY_HAS_MAGICANEG was
checked. But it left the flag being set in the drivers. Remove the flag.
Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3fdd34c1
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 38 deletions
drivers/net/phy/broadcom.c
View file @ 1b86f702
...@@ -540,7 +540,7 @@ static struct phy_driver broadcom_drivers[] = { ...@@ -540,7 +540,7 @@ static struct phy_driver broadcom_drivers[] = {
.phy_id_mask = 0xfffffff0, .phy_id_mask = 0xfffffff0,
.name = "Broadcom BCM5411", .name = "Broadcom BCM5411",
.features = PHY_GBIT_FEATURES, .features = PHY_GBIT_FEATURES,
.flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .flags = PHY_HAS_INTERRUPT,
.config_init = bcm54xx_config_init, .config_init = bcm54xx_config_init,
.config_aneg = genphy_config_aneg, .config_aneg = genphy_config_aneg,
.read_status = genphy_read_status, .read_status = genphy_read_status,
...@@ -551,7 +551,7 @@ static struct phy_driver broadcom_drivers[] = { ...@@ -551,7 +551,7 @@ static struct phy_driver broadcom_drivers[] = {
.phy_id_mask = 0xfffffff0, .phy_id_mask = 0xfffffff0,
.name = "Broadcom BCM5421", .name = "Broadcom BCM5421",
.features = PHY_GBIT_FEATURES, .features = PHY_GBIT_FEATURES,
.flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .flags = PHY_HAS_INTERRUPT,
.config_init = bcm54xx_config_init, .config_init = bcm54xx_config_init,
.config_aneg = genphy_config_aneg, .config_aneg = genphy_config_aneg,
.read_status = genphy_read_status, .read_status = genphy_read_status,
...@@ -562,7 +562,7 @@ static struct phy_driver broadcom_drivers[] = { ...@@ -562,7 +562,7 @@ static struct phy_driver broadcom_drivers[] = {
.phy_id_mask = 0xfffffff0, .phy_id_mask = 0xfffffff0,
.name = "Broadcom BCM54210E", .name = "Broadcom BCM54210E",
.features = PHY_GBIT_FEATURES, .features = PHY_GBIT_FEATURES,
.flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .flags = PHY_HAS_INTERRUPT,
.config_init = bcm54xx_config_init, .config_init = bcm54xx_config_init,
.config_aneg = genphy_config_aneg, .config_aneg = genphy_config_aneg,
.read_status = genphy_read_status, .read_status = genphy_read_status,
...@@ -573,7 +573,7 @@ static struct phy_driver broadcom_drivers[] = { ...@@ -573,7 +573,7 @@ static struct phy_driver broadcom_drivers[] = {
.phy_id_mask = 0xfffffff0, .phy_id_mask = 0xfffffff0,
.name = "Broadcom BCM5461", .name = "Broadcom BCM5461",
.features = PHY_GBIT_FEATURES, .features = PHY_GBIT_FEATURES,
.flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .flags = PHY_HAS_INTERRUPT,
.config_init = bcm54xx_config_init, .config_init = bcm54xx_config_init,
.config_aneg = genphy_config_aneg, .config_aneg = genphy_config_aneg,
.read_status = genphy_read_status, .read_status = genphy_read_status,
...@@ -584,7 +584,7 @@ static struct phy_driver broadcom_drivers[] = { ...@@ -584,7 +584,7 @@ static struct phy_driver broadcom_drivers[] = {
.phy_id_mask = 0xfffffff0, .phy_id_mask = 0xfffffff0,
.name = "Broadcom BCM54612E", .name = "Broadcom BCM54612E",
.features = PHY_GBIT_FEATURES, .features = PHY_GBIT_FEATURES,
.flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .flags = PHY_HAS_INTERRUPT,
.config_init = bcm54xx_config_init, .config_init = bcm54xx_config_init,
.config_aneg = genphy_config_aneg, .config_aneg = genphy_config_aneg,
.read_status = genphy_read_status, .read_status = genphy_read_status,
...@@ -595,7 +595,7 @@ static struct phy_driver broadcom_drivers[] = { ...@@ -595,7 +595,7 @@ static struct phy_driver broadcom_drivers[] = {
.phy_id_mask = 0xfffffff0, .phy_id_mask = 0xfffffff0,
.name = "Broadcom BCM54616S", .name = "Broadcom BCM54616S",
.features = PHY_GBIT_FEATURES, .features = PHY_GBIT_FEATURES,
.flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .flags = PHY_HAS_INTERRUPT,
.config_init = bcm54xx_config_init, .config_init = bcm54xx_config_init,
.config_aneg = genphy_config_aneg, .config_aneg = genphy_config_aneg,
.read_status = genphy_read_status, .read_status = genphy_read_status,
...@@ -606,7 +606,7 @@ static struct phy_driver broadcom_drivers[] = { ...@@ -606,7 +606,7 @@ static struct phy_driver broadcom_drivers[] = {
.phy_id_mask = 0xfffffff0, .phy_id_mask = 0xfffffff0,
.name = "Broadcom BCM5464", .name = "Broadcom BCM5464",
.features = PHY_GBIT_FEATURES, .features = PHY_GBIT_FEATURES,
.flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .flags = PHY_HAS_INTERRUPT,
.config_init = bcm54xx_config_init, .config_init = bcm54xx_config_init,
.config_aneg = genphy_config_aneg, .config_aneg = genphy_config_aneg,
.read_status = genphy_read_status, .read_status = genphy_read_status,
...@@ -617,7 +617,7 @@ static struct phy_driver broadcom_drivers[] = { ...@@ -617,7 +617,7 @@ static struct phy_driver broadcom_drivers[] = {
.phy_id_mask = 0xfffffff0, .phy_id_mask = 0xfffffff0,
.name = "Broadcom BCM5481", .name = "Broadcom BCM5481",
.features = PHY_GBIT_FEATURES, .features = PHY_GBIT_FEATURES,
.flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .flags = PHY_HAS_INTERRUPT,
.config_init = bcm54xx_config_init, .config_init = bcm54xx_config_init,
.config_aneg = bcm5481_config_aneg, .config_aneg = bcm5481_config_aneg,
.read_status = genphy_read_status, .read_status = genphy_read_status,
...@@ -628,7 +628,7 @@ static struct phy_driver broadcom_drivers[] = { ...@@ -628,7 +628,7 @@ static struct phy_driver broadcom_drivers[] = {
.phy_id_mask = 0xfffffff0, .phy_id_mask = 0xfffffff0,
.name = "Broadcom BCM54810", .name = "Broadcom BCM54810",
.features = PHY_GBIT_FEATURES, .features = PHY_GBIT_FEATURES,
.flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .flags = PHY_HAS_INTERRUPT,
.config_init = bcm54xx_config_init, .config_init = bcm54xx_config_init,
.config_aneg = bcm5481_config_aneg, .config_aneg = bcm5481_config_aneg,
.read_status = genphy_read_status, .read_status = genphy_read_status,
...@@ -639,7 +639,7 @@ static struct phy_driver broadcom_drivers[] = { ...@@ -639,7 +639,7 @@ static struct phy_driver broadcom_drivers[] = {
.phy_id_mask = 0xfffffff0, .phy_id_mask = 0xfffffff0,
.name = "Broadcom BCM5482", .name = "Broadcom BCM5482",
.features = PHY_GBIT_FEATURES, .features = PHY_GBIT_FEATURES,
.flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .flags = PHY_HAS_INTERRUPT,
.config_init = bcm5482_config_init, .config_init = bcm5482_config_init,
.config_aneg = genphy_config_aneg, .config_aneg = genphy_config_aneg,
.read_status = bcm5482_read_status, .read_status = bcm5482_read_status,
...@@ -650,7 +650,7 @@ static struct phy_driver broadcom_drivers[] = { ...@@ -650,7 +650,7 @@ static struct phy_driver broadcom_drivers[] = {
.phy_id_mask = 0xfffffff0, .phy_id_mask = 0xfffffff0,
.name = "Broadcom BCM50610", .name = "Broadcom BCM50610",
.features = PHY_GBIT_FEATURES, .features = PHY_GBIT_FEATURES,
.flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .flags = PHY_HAS_INTERRUPT,
.config_init = bcm54xx_config_init, .config_init = bcm54xx_config_init,
.config_aneg = genphy_config_aneg, .config_aneg = genphy_config_aneg,
.read_status = genphy_read_status, .read_status = genphy_read_status,
...@@ -661,7 +661,7 @@ static struct phy_driver broadcom_drivers[] = { ...@@ -661,7 +661,7 @@ static struct phy_driver broadcom_drivers[] = {
.phy_id_mask = 0xfffffff0, .phy_id_mask = 0xfffffff0,
.name = "Broadcom BCM50610M", .name = "Broadcom BCM50610M",
.features = PHY_GBIT_FEATURES, .features = PHY_GBIT_FEATURES,
.flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .flags = PHY_HAS_INTERRUPT,
.config_init = bcm54xx_config_init, .config_init = bcm54xx_config_init,
.config_aneg = genphy_config_aneg, .config_aneg = genphy_config_aneg,
.read_status = genphy_read_status, .read_status = genphy_read_status,
...@@ -672,7 +672,7 @@ static struct phy_driver broadcom_drivers[] = { ...@@ -672,7 +672,7 @@ static struct phy_driver broadcom_drivers[] = {
.phy_id_mask = 0xfffffff0, .phy_id_mask = 0xfffffff0,
.name = "Broadcom BCM57780", .name = "Broadcom BCM57780",
.features = PHY_GBIT_FEATURES, .features = PHY_GBIT_FEATURES,
.flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .flags = PHY_HAS_INTERRUPT,
.config_init = bcm54xx_config_init, .config_init = bcm54xx_config_init,
.config_aneg = genphy_config_aneg, .config_aneg = genphy_config_aneg,
.read_status = genphy_read_status, .read_status = genphy_read_status,
...@@ -683,7 +683,7 @@ static struct phy_driver broadcom_drivers[] = { ...@@ -683,7 +683,7 @@ static struct phy_driver broadcom_drivers[] = {
.phy_id_mask = 0xfffffff0, .phy_id_mask = 0xfffffff0,
.name = "Broadcom BCMAC131", .name = "Broadcom BCMAC131",
.features = PHY_BASIC_FEATURES, .features = PHY_BASIC_FEATURES,
.flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .flags = PHY_HAS_INTERRUPT,
.config_init = brcm_fet_config_init, .config_init = brcm_fet_config_init,
.config_aneg = genphy_config_aneg, .config_aneg = genphy_config_aneg,
.read_status = genphy_read_status, .read_status = genphy_read_status,
...@@ -694,7 +694,7 @@ static struct phy_driver broadcom_drivers[] = { ...@@ -694,7 +694,7 @@ static struct phy_driver broadcom_drivers[] = {
.phy_id_mask = 0xfffffff0, .phy_id_mask = 0xfffffff0,
.name = "Broadcom BCM5241", .name = "Broadcom BCM5241",
.features = PHY_BASIC_FEATURES, .features = PHY_BASIC_FEATURES,
.flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .flags = PHY_HAS_INTERRUPT,
.config_init = brcm_fet_config_init, .config_init = brcm_fet_config_init,
.config_aneg = genphy_config_aneg, .config_aneg = genphy_config_aneg,
.read_status = genphy_read_status, .read_status = genphy_read_status,
......
drivers/net/phy/micrel.c
View file @ 1b86f702
...@@ -779,7 +779,7 @@ static struct phy_driver ksphy_driver[] = { ...@@ -779,7 +779,7 @@ static struct phy_driver ksphy_driver[] = {
.phy_id_mask = MICREL_PHY_ID_MASK, .phy_id_mask = MICREL_PHY_ID_MASK,
.name = "Micrel KS8737", .name = "Micrel KS8737",
.features = PHY_BASIC_FEATURES, .features = PHY_BASIC_FEATURES,
.flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .flags = PHY_HAS_INTERRUPT,
.driver_data = &ks8737_type, .driver_data = &ks8737_type,
.config_init = kszphy_config_init, .config_init = kszphy_config_init,
.config_aneg = genphy_config_aneg, .config_aneg = genphy_config_aneg,
...@@ -793,7 +793,7 @@ static struct phy_driver ksphy_driver[] = { ...@@ -793,7 +793,7 @@ static struct phy_driver ksphy_driver[] = {
.phy_id_mask = 0x00ffffff, .phy_id_mask = 0x00ffffff,
.name = "Micrel KSZ8021 or KSZ8031", .name = "Micrel KSZ8021 or KSZ8031",
.features = PHY_BASIC_FEATURES, .features = PHY_BASIC_FEATURES,
.flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .flags = PHY_HAS_INTERRUPT,
.driver_data = &ksz8021_type, .driver_data = &ksz8021_type,
.probe = kszphy_probe, .probe = kszphy_probe,
.config_init = kszphy_config_init, .config_init = kszphy_config_init,
...@@ -811,7 +811,7 @@ static struct phy_driver ksphy_driver[] = { ...@@ -811,7 +811,7 @@ static struct phy_driver ksphy_driver[] = {
.phy_id_mask = 0x00ffffff, .phy_id_mask = 0x00ffffff,
.name = "Micrel KSZ8031", .name = "Micrel KSZ8031",
.features = PHY_BASIC_FEATURES, .features = PHY_BASIC_FEATURES,
.flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .flags = PHY_HAS_INTERRUPT,
.driver_data = &ksz8021_type, .driver_data = &ksz8021_type,
.probe = kszphy_probe, .probe = kszphy_probe,
.config_init = kszphy_config_init, .config_init = kszphy_config_init,
...@@ -829,7 +829,7 @@ static struct phy_driver ksphy_driver[] = { ...@@ -829,7 +829,7 @@ static struct phy_driver ksphy_driver[] = {
.phy_id_mask = MICREL_PHY_ID_MASK, .phy_id_mask = MICREL_PHY_ID_MASK,
.name = "Micrel KSZ8041", .name = "Micrel KSZ8041",
.features = PHY_BASIC_FEATURES, .features = PHY_BASIC_FEATURES,
.flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .flags = PHY_HAS_INTERRUPT,
.driver_data = &ksz8041_type, .driver_data = &ksz8041_type,
.probe = kszphy_probe, .probe = kszphy_probe,
.config_init = ksz8041_config_init, .config_init = ksz8041_config_init,
...@@ -847,7 +847,7 @@ static struct phy_driver ksphy_driver[] = { ...@@ -847,7 +847,7 @@ static struct phy_driver ksphy_driver[] = {
.phy_id_mask = MICREL_PHY_ID_MASK, .phy_id_mask = MICREL_PHY_ID_MASK,
.name = "Micrel KSZ8041RNLI", .name = "Micrel KSZ8041RNLI",
.features = PHY_BASIC_FEATURES, .features = PHY_BASIC_FEATURES,
.flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .flags = PHY_HAS_INTERRUPT,
.driver_data = &ksz8041_type, .driver_data = &ksz8041_type,
.probe = kszphy_probe, .probe = kszphy_probe,
.config_init = kszphy_config_init, .config_init = kszphy_config_init,
...@@ -865,7 +865,7 @@ static struct phy_driver ksphy_driver[] = { ...@@ -865,7 +865,7 @@ static struct phy_driver ksphy_driver[] = {
.phy_id_mask = MICREL_PHY_ID_MASK, .phy_id_mask = MICREL_PHY_ID_MASK,
.name = "Micrel KSZ8051", .name = "Micrel KSZ8051",
.features = PHY_BASIC_FEATURES, .features = PHY_BASIC_FEATURES,
.flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .flags = PHY_HAS_INTERRUPT,
.driver_data = &ksz8051_type, .driver_data = &ksz8051_type,
.probe = kszphy_probe, .probe = kszphy_probe,
.config_init = kszphy_config_init, .config_init = kszphy_config_init,
...@@ -883,7 +883,7 @@ static struct phy_driver ksphy_driver[] = { ...@@ -883,7 +883,7 @@ static struct phy_driver ksphy_driver[] = {
.name = "Micrel KSZ8001 or KS8721", .name = "Micrel KSZ8001 or KS8721",
.phy_id_mask = 0x00fffffc, .phy_id_mask = 0x00fffffc,
.features = PHY_BASIC_FEATURES, .features = PHY_BASIC_FEATURES,
.flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .flags = PHY_HAS_INTERRUPT,
.driver_data = &ksz8041_type, .driver_data = &ksz8041_type,
.probe = kszphy_probe, .probe = kszphy_probe,
.config_init = kszphy_config_init, .config_init = kszphy_config_init,
...@@ -901,7 +901,7 @@ static struct phy_driver ksphy_driver[] = { ...@@ -901,7 +901,7 @@ static struct phy_driver ksphy_driver[] = {
.name = "Micrel KSZ8081 or KSZ8091", .name = "Micrel KSZ8081 or KSZ8091",
.phy_id_mask = MICREL_PHY_ID_MASK, .phy_id_mask = MICREL_PHY_ID_MASK,
.features = PHY_BASIC_FEATURES, .features = PHY_BASIC_FEATURES,
.flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .flags = PHY_HAS_INTERRUPT,
.driver_data = &ksz8081_type, .driver_data = &ksz8081_type,
.probe = kszphy_probe, .probe = kszphy_probe,
.config_init = kszphy_config_init, .config_init = kszphy_config_init,
...@@ -919,7 +919,7 @@ static struct phy_driver ksphy_driver[] = { ...@@ -919,7 +919,7 @@ static struct phy_driver ksphy_driver[] = {
.name = "Micrel KSZ8061", .name = "Micrel KSZ8061",
.phy_id_mask = MICREL_PHY_ID_MASK, .phy_id_mask = MICREL_PHY_ID_MASK,
.features = PHY_BASIC_FEATURES, .features = PHY_BASIC_FEATURES,
.flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .flags = PHY_HAS_INTERRUPT,
.config_init = kszphy_config_init, .config_init = kszphy_config_init,
.config_aneg = genphy_config_aneg, .config_aneg = genphy_config_aneg,
.read_status = genphy_read_status, .read_status = genphy_read_status,
...@@ -932,7 +932,7 @@ static struct phy_driver ksphy_driver[] = { ...@@ -932,7 +932,7 @@ static struct phy_driver ksphy_driver[] = {
.phy_id_mask = 0x000ffffe, .phy_id_mask = 0x000ffffe,
.name = "Micrel KSZ9021 Gigabit PHY", .name = "Micrel KSZ9021 Gigabit PHY",
.features = PHY_GBIT_FEATURES, .features = PHY_GBIT_FEATURES,
.flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .flags = PHY_HAS_INTERRUPT,
.driver_data = &ksz9021_type, .driver_data = &ksz9021_type,
.probe = kszphy_probe, .probe = kszphy_probe,
.config_init = ksz9021_config_init, .config_init = ksz9021_config_init,
...@@ -952,7 +952,7 @@ static struct phy_driver ksphy_driver[] = { ...@@ -952,7 +952,7 @@ static struct phy_driver ksphy_driver[] = {
.phy_id_mask = MICREL_PHY_ID_MASK, .phy_id_mask = MICREL_PHY_ID_MASK,
.name = "Micrel KSZ9031 Gigabit PHY", .name = "Micrel KSZ9031 Gigabit PHY",
.features = PHY_GBIT_FEATURES, .features = PHY_GBIT_FEATURES,
.flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .flags = PHY_HAS_INTERRUPT,
.driver_data = &ksz9021_type, .driver_data = &ksz9021_type,
.probe = kszphy_probe, .probe = kszphy_probe,
.config_init = ksz9031_config_init, .config_init = ksz9031_config_init,
...@@ -969,7 +969,6 @@ static struct phy_driver ksphy_driver[] = { ...@@ -969,7 +969,6 @@ static struct phy_driver ksphy_driver[] = {
.phy_id = PHY_ID_KSZ8873MLL, .phy_id = PHY_ID_KSZ8873MLL,
.phy_id_mask = MICREL_PHY_ID_MASK, .phy_id_mask = MICREL_PHY_ID_MASK,
.name = "Micrel KSZ8873MLL Switch", .name = "Micrel KSZ8873MLL Switch",
.flags = PHY_HAS_MAGICANEG,
.config_init = kszphy_config_init, .config_init = kszphy_config_init,
.config_aneg = ksz8873mll_config_aneg, .config_aneg = ksz8873mll_config_aneg,
.read_status = ksz8873mll_read_status, .read_status = ksz8873mll_read_status,
...@@ -980,7 +979,7 @@ static struct phy_driver ksphy_driver[] = { ...@@ -980,7 +979,7 @@ static struct phy_driver ksphy_driver[] = {
.phy_id_mask = MICREL_PHY_ID_MASK, .phy_id_mask = MICREL_PHY_ID_MASK,
.name = "Micrel KSZ886X Switch", .name = "Micrel KSZ886X Switch",
.features = PHY_BASIC_FEATURES, .features = PHY_BASIC_FEATURES,
.flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .flags = PHY_HAS_INTERRUPT,
.config_init = kszphy_config_init, .config_init = kszphy_config_init,
.config_aneg = genphy_config_aneg, .config_aneg = genphy_config_aneg,
.read_status = genphy_read_status, .read_status = genphy_read_status,
...@@ -991,7 +990,7 @@ static struct phy_driver ksphy_driver[] = { ...@@ -991,7 +990,7 @@ static struct phy_driver ksphy_driver[] = {
.phy_id_mask = MICREL_PHY_ID_MASK, .phy_id_mask = MICREL_PHY_ID_MASK,
.name = "Micrel KSZ8795", .name = "Micrel KSZ8795",
.features = PHY_BASIC_FEATURES, .features = PHY_BASIC_FEATURES,
.flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .flags = PHY_HAS_INTERRUPT,
.config_init = kszphy_config_init, .config_init = kszphy_config_init,
.config_aneg = ksz8873mll_config_aneg, .config_aneg = ksz8873mll_config_aneg,
.read_status = ksz8873mll_read_status, .read_status = ksz8873mll_read_status,
......
drivers/net/phy/microchip.c
View file @ 1b86f702
...@@ -146,7 +146,7 @@ static struct phy_driver microchip_phy_driver[] = { ...@@ -146,7 +146,7 @@ static struct phy_driver microchip_phy_driver[] = {
.name = "Microchip LAN88xx", .name = "Microchip LAN88xx",
.features = PHY_GBIT_FEATURES, .features = PHY_GBIT_FEATURES,
.flags = PHY_HAS_INTERRUPT | PHY_HAS_MAGICANEG, .flags = PHY_HAS_INTERRUPT,
.probe = lan88xx_probe, .probe = lan88xx_probe,
.remove = lan88xx_remove, .remove = lan88xx_remove,
......
drivers/net/phy/smsc.c
View file @ 1b86f702
...@@ -170,7 +170,7 @@ static struct phy_driver smsc_phy_driver[] = { ...@@ -170,7 +170,7 @@ static struct phy_driver smsc_phy_driver[] = {
.name = "SMSC LAN83C185", .name = "SMSC LAN83C185",
.features = PHY_BASIC_FEATURES, .features = PHY_BASIC_FEATURES,
.flags = PHY_HAS_INTERRUPT | PHY_HAS_MAGICANEG, .flags = PHY_HAS_INTERRUPT,
.probe = smsc_phy_probe, .probe = smsc_phy_probe,
...@@ -192,7 +192,7 @@ static struct phy_driver smsc_phy_driver[] = { ...@@ -192,7 +192,7 @@ static struct phy_driver smsc_phy_driver[] = {
.name = "SMSC LAN8187", .name = "SMSC LAN8187",
.features = PHY_BASIC_FEATURES, .features = PHY_BASIC_FEATURES,
.flags = PHY_HAS_INTERRUPT | PHY_HAS_MAGICANEG, .flags = PHY_HAS_INTERRUPT,
.probe = smsc_phy_probe, .probe = smsc_phy_probe,
...@@ -214,7 +214,7 @@ static struct phy_driver smsc_phy_driver[] = { ...@@ -214,7 +214,7 @@ static struct phy_driver smsc_phy_driver[] = {
.name = "SMSC LAN8700", .name = "SMSC LAN8700",
.features = PHY_BASIC_FEATURES, .features = PHY_BASIC_FEATURES,
.flags = PHY_HAS_INTERRUPT | PHY_HAS_MAGICANEG, .flags = PHY_HAS_INTERRUPT,
.probe = smsc_phy_probe, .probe = smsc_phy_probe,
...@@ -236,7 +236,7 @@ static struct phy_driver smsc_phy_driver[] = { ...@@ -236,7 +236,7 @@ static struct phy_driver smsc_phy_driver[] = {
.name = "SMSC LAN911x Internal PHY", .name = "SMSC LAN911x Internal PHY",
.features = PHY_BASIC_FEATURES, .features = PHY_BASIC_FEATURES,
.flags = PHY_HAS_INTERRUPT | PHY_HAS_MAGICANEG, .flags = PHY_HAS_INTERRUPT,
.probe = smsc_phy_probe, .probe = smsc_phy_probe,
...@@ -257,7 +257,7 @@ static struct phy_driver smsc_phy_driver[] = { ...@@ -257,7 +257,7 @@ static struct phy_driver smsc_phy_driver[] = {
.name = "SMSC LAN8710/LAN8720", .name = "SMSC LAN8710/LAN8720",
.features = PHY_BASIC_FEATURES, .features = PHY_BASIC_FEATURES,
.flags = PHY_HAS_INTERRUPT | PHY_HAS_MAGICANEG, .flags = PHY_HAS_INTERRUPT,
.probe = smsc_phy_probe, .probe = smsc_phy_probe,
...@@ -279,7 +279,7 @@ static struct phy_driver smsc_phy_driver[] = { ...@@ -279,7 +279,7 @@ static struct phy_driver smsc_phy_driver[] = {
.name = "SMSC LAN8740", .name = "SMSC LAN8740",
.features = PHY_BASIC_FEATURES, .features = PHY_BASIC_FEATURES,
.flags = PHY_HAS_INTERRUPT | PHY_HAS_MAGICANEG, .flags = PHY_HAS_INTERRUPT,
.probe = smsc_phy_probe, .probe = smsc_phy_probe,
......
include/linux/phy.h
View file @ 1b86f702
...@@ -58,8 +58,7 @@ ...@@ -58,8 +58,7 @@
#define PHY_IGNORE_INTERRUPT -2 #define PHY_IGNORE_INTERRUPT -2
#define PHY_HAS_INTERRUPT 0x00000001 #define PHY_HAS_INTERRUPT 0x00000001
#define PHY_HAS_MAGICANEG 0x00000002 #define PHY_IS_INTERNAL 0x00000002
#define PHY_IS_INTERNAL 0x00000004
#define MDIO_DEVICE_IS_PHY 0x80000000 #define MDIO_DEVICE_IS_PHY 0x80000000
/* Interface Mode definitions */ /* Interface Mode definitions */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7