mvebu: remove linux 4.4 support

[openwrt/staging/lynxis/omap.git] / target / linux / mvebu / patches-4.4 / 146-sfp-phylink-hook-up-eeprom-functions.patch

diff --git a/target/linux/mvebu/patches-4.4/146-sfp-phylink-hook-up-eeprom-functions.patch b/target/linux/mvebu/patches-4.4/146-sfp-phylink-hook-up-eeprom-functions.patch
deleted file mode 100644 (file)
index f37e652..0000000
--- a/target/linux/mvebu/patches-4.4/146-sfp-phylink-hook-up-eeprom-functions.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From a7091ef24223ed39b39c6b73b77c55c8a607f34a Mon Sep 17 00:00:00 2001
-From: Russell King <rmk+kernel@arm.linux.org.uk>
-Date: Thu, 8 Oct 2015 23:49:47 +0100
-Subject: [PATCH 734/744] sfp/phylink: hook up eeprom functions
-
-Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
----
- drivers/net/phy/sfp.c | 19 +++++++++++--------
- 1 file changed, 11 insertions(+), 8 deletions(-)
-
---- a/drivers/net/phy/sfp.c
-+++ b/drivers/net/phy/sfp.c
-@@ -901,11 +901,9 @@ static void sfp_sm_event(struct sfp *sfp
-       mutex_unlock(&sfp->sm_mutex);
- }
- 
--#if 0
--static int sfp_phy_module_info(struct phy_device *phy,
--                             struct ethtool_modinfo *modinfo)
-+static int sfp_module_info(void *priv, struct ethtool_modinfo *modinfo)
- {
--      struct sfp *sfp = phy->priv;
-+      struct sfp *sfp = priv;
- 
-       /* locking... and check module is present */
- 
-@@ -919,10 +917,9 @@ static int sfp_phy_module_info(struct ph
-       return 0;
- }
- 
--static int sfp_phy_module_eeprom(struct phy_device *phy,
--      struct ethtool_eeprom *ee, u8 *data)
-+static int sfp_module_eeprom(void *priv, struct ethtool_eeprom *ee, u8 *data)
- {
--      struct sfp *sfp = phy->priv;
-+      struct sfp *sfp = priv;
-       unsigned int first, last, len;
-       int ret;
- 
-@@ -953,7 +950,11 @@ static int sfp_phy_module_eeprom(struct
-       }
-       return 0;
- }
--#endif
-+
-+static const struct phylink_module_ops sfp_module_ops = {
-+      .get_module_info = sfp_module_info,
-+      .get_module_eeprom = sfp_module_eeprom,
-+};
- 
- static void sfp_timeout(struct work_struct *work)
- {
-@@ -1029,6 +1030,7 @@ static int sfp_netdev_notify(struct noti
-       case NETDEV_UNREGISTER:
-               if (sfp->mod_phy && sfp->phylink)
-                       phylink_disconnect_phy(sfp->phylink);
-+              phylink_unregister_module(sfp->phylink, sfp);
-               sfp->phylink = NULL;
-               dev_put(sfp->ndev);
-               sfp->ndev = NULL;
-@@ -1145,6 +1147,7 @@ static int sfp_probe(struct platform_dev
-               }
- 
-               phylink_disable(sfp->phylink);
-+              phylink_register_module(sfp->phylink, sfp, &sfp_module_ops);
-       }
- 
-       sfp->state = sfp_get_state(sfp);