diff options
| author | Felix Fietkau <nbd@nbd.name> | 2020-11-26 17:29:11 +0100 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2020-12-05 12:06:28 +0100 |
| commit | 1d5ad1b85365a4376f8560bbadffc5fe7fb131a3 (patch) | |
| tree | 5c0f64630b9d1b0aa9400a3a7fe26b93a049bfe3 /target/linux/generic | |
| parent | 8eeb57acb75f9d89abed59595de052dba9fed7b8 (diff) | |
| download | upstream-1d5ad1b85365a4376f8560bbadffc5fe7fb131a3.tar.gz upstream-1d5ad1b85365a4376f8560bbadffc5fe7fb131a3.tar.bz2 upstream-1d5ad1b85365a4376f8560bbadffc5fe7fb131a3.zip | |
kernel: remove an unused callback from the ip17xx switch driver
Also remove the leftover kernel hack that adds support for it
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'target/linux/generic')
| -rw-r--r-- | target/linux/generic/files/drivers/net/phy/ip17xx.c | 7 | ||||
| -rw-r--r-- | target/linux/generic/hack-5.4/702-phy_add_aneg_done_function.patch | 27 |
2 files changed, 0 insertions, 34 deletions
diff --git a/target/linux/generic/files/drivers/net/phy/ip17xx.c b/target/linux/generic/files/drivers/net/phy/ip17xx.c index 88bdc29cb7..c369803395 100644 --- a/target/linux/generic/files/drivers/net/phy/ip17xx.c +++ b/target/linux/generic/files/drivers/net/phy/ip17xx.c @@ -1337,12 +1337,6 @@ static int ip17xx_aneg_done(struct phy_device *pdev) return 1; /* Return any positive value */ } -static int ip17xx_update_link(struct phy_device *pdev) -{ - pdev->link = 1; - return 0; -} - static int ip17xx_read_status(struct phy_device *pdev) { pdev->speed = SPEED_100; @@ -1364,7 +1358,6 @@ static struct phy_driver ip17xx_driver[] = { .config_init = ip17xx_config_init, .config_aneg = ip17xx_config_aneg, .aneg_done = ip17xx_aneg_done, - .update_link = ip17xx_update_link, .read_status = ip17xx_read_status, } }; diff --git a/target/linux/generic/hack-5.4/702-phy_add_aneg_done_function.patch b/target/linux/generic/hack-5.4/702-phy_add_aneg_done_function.patch deleted file mode 100644 index 0e292f5b6f..0000000000 --- a/target/linux/generic/hack-5.4/702-phy_add_aneg_done_function.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/include/linux/phy.h -+++ b/include/linux/phy.h -@@ -524,6 +524,12 @@ struct phy_driver { - /* Determines the negotiated speed and duplex */ - int (*read_status)(struct phy_device *phydev); - -+ /* -+ * Update the value in phydev->link to reflect the -+ * current link value -+ */ -+ int (*update_link)(struct phy_device *phydev); -+ - /* Clears any pending interrupts */ - int (*ack_interrupt)(struct phy_device *phydev); - ---- a/drivers/net/phy/phy_device.c -+++ b/drivers/net/phy/phy_device.c -@@ -1912,6 +1912,9 @@ int genphy_update_link(struct phy_device - if (bmcr & BMCR_ANRESTART) - goto done; - -+ if (phydev->drv && phydev->drv->update_link) -+ return phydev->drv->update_link(phydev); -+ - /* The link state is latched low so that momentary link - * drops can be detected. Do not double-read the status - * in polling mode to detect such short link drops. |