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

Revert "net: hns: fix LED configuration for marvell phy"

This reverts commit f4e5f775db5a4631300dccd0de5eafb50a77c131.

Andrew Lunn says this should be handled another way.

Signed-off-by: David S. Miller <davem@davemloft.net>

+1 -22
+1 -22
drivers/net/ethernet/hisilicon/hns/hns_enet.c
··· 11 11 #include <linux/io.h> 12 12 #include <linux/ip.h> 13 13 #include <linux/ipv6.h> 14 - #include <linux/marvell_phy.h> 15 14 #include <linux/module.h> 16 15 #include <linux/phy.h> 17 16 #include <linux/platform_device.h> ··· 1149 1150 } 1150 1151 } 1151 1152 1152 - static int hns_phy_marvell_fixup(struct phy_device *phydev) 1153 - { 1154 - phydev->dev_flags |= MARVELL_PHY_LED0_LINK_LED1_ACTIVE; 1155 - 1156 - return 0; 1157 - } 1158 - 1159 1153 /** 1160 1154 *hns_nic_init_phy - init phy 1161 1155 *@ndev: net device ··· 1173 1181 1174 1182 if (h->phy_if != PHY_INTERFACE_MODE_XGMII) { 1175 1183 phy_dev->dev_flags = 0; 1176 - 1177 - /* register the PHY fixup (for Marvell 88E1510) */ 1178 - ret = phy_register_fixup_for_uid(MARVELL_PHY_ID_88E1510, 1179 - MARVELL_PHY_ID_MASK, 1180 - hns_phy_marvell_fixup); 1181 - /* we can live without it, so just issue a warning */ 1182 - if (ret) 1183 - netdev_warn(ndev, 1184 - "Cannot register PHY fixup, ret=%d\n", 1185 - ret); 1186 1184 1187 1185 ret = phy_connect_direct(ndev, phy_dev, hns_nic_adjust_link, 1188 1186 h->phy_if); ··· 2430 2448 hns_nic_uninit_ring_data(priv); 2431 2449 priv->ring_data = NULL; 2432 2450 2433 - if (ndev->phydev) { 2434 - phy_unregister_fixup_for_uid(MARVELL_PHY_ID_88E1510, 2435 - MARVELL_PHY_ID_MASK); 2451 + if (ndev->phydev) 2436 2452 phy_disconnect(ndev->phydev); 2437 - } 2438 2453 2439 2454 if (!IS_ERR_OR_NULL(priv->ae_handle)) 2440 2455 hnae_put_handle(priv->ae_handle);