net: sfp: get rid of DM7052 hack when enabling high power

Since we no longer mis-detect high-power mode with the DM7052 module,
we no longer need the hack in sfp_module_enable_high_power(), and can
now switch this to use sfp_modify_u8().

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c
index 921bbed..39fd181 100644 (file)
--- a/drivers/net/phy/sfp.c
+++ b/drivers/net/phy/sfp.c
@@ -1837,31 +1837,14 @@ static int sfp_module_parse_power(struct sfp *sfp)
 
 static int sfp_sm_mod_hpower(struct sfp *sfp, bool enable)
 {
-       u8 val;
        int err;
 
-       err = sfp_read(sfp, true, SFP_EXT_STATUS, &val, sizeof(val));
-       if (err != sizeof(val)) {
-               dev_err(sfp->dev, "Failed to read EEPROM: %pe\n", ERR_PTR(err));
-               return -EAGAIN;
-       }
-
-       /* DM7052 reports as a high power module, responds to reads (with
-        * all bytes 0xff) at 0x51 but does not accept writes.  In any case,
-        * if the bit is already set, we're already in high power mode.
-        */
-       if (!!(val & SFP_EXT_STATUS_PWRLVL_SELECT) == enable)
-               return 0;
-
-       if (enable)
-               val |= SFP_EXT_STATUS_PWRLVL_SELECT;
-       else
-               val &= ~SFP_EXT_STATUS_PWRLVL_SELECT;
-
-       err = sfp_write(sfp, true, SFP_EXT_STATUS, &val, sizeof(val));
-       if (err != sizeof(val)) {
-               dev_err(sfp->dev, "Failed to write EEPROM: %pe\n",
-                       ERR_PTR(err));
+       err = sfp_modify_u8(sfp, true, SFP_EXT_STATUS,
+                           SFP_EXT_STATUS_PWRLVL_SELECT,
+                           enable ? SFP_EXT_STATUS_PWRLVL_SELECT : 0);
+       if (err != sizeof(u8)) {
+               dev_err(sfp->dev, "failed to %sable high power: %pe\n",
+                       enable ? "en" : "dis", ERR_PTR(err));
                return -EAGAIN;
        }