Commit 9ae1ef4b authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski

net: sfp: use %pe for printing errors

Convert sfp to use %pe for printing error codes, which can print them
as errno symbols rather than numbers.
Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Link: https://lore.kernel.org/r/E1nOyEN-00BuuE-OB@rmk-PC.armlinux.org.ukSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent ab1198e5
...@@ -471,8 +471,8 @@ static unsigned int sfp_soft_get_state(struct sfp *sfp) ...@@ -471,8 +471,8 @@ static unsigned int sfp_soft_get_state(struct sfp *sfp)
state |= SFP_F_TX_FAULT; state |= SFP_F_TX_FAULT;
} else { } else {
dev_err_ratelimited(sfp->dev, dev_err_ratelimited(sfp->dev,
"failed to read SFP soft status: %d\n", "failed to read SFP soft status: %pe\n",
ret); ERR_PTR(ret));
/* Preserve the current state */ /* Preserve the current state */
state = sfp->state; state = sfp->state;
} }
...@@ -1311,7 +1311,8 @@ static void sfp_hwmon_probe(struct work_struct *work) ...@@ -1311,7 +1311,8 @@ static void sfp_hwmon_probe(struct work_struct *work)
mod_delayed_work(system_wq, &sfp->hwmon_probe, mod_delayed_work(system_wq, &sfp->hwmon_probe,
T_PROBE_RETRY_SLOW); T_PROBE_RETRY_SLOW);
} else { } else {
dev_warn(sfp->dev, "hwmon probe failed: %d\n", err); dev_warn(sfp->dev, "hwmon probe failed: %pe\n",
ERR_PTR(err));
} }
return; return;
} }
...@@ -1516,14 +1517,15 @@ static int sfp_sm_probe_phy(struct sfp *sfp, bool is_c45) ...@@ -1516,14 +1517,15 @@ static int sfp_sm_probe_phy(struct sfp *sfp, bool is_c45)
if (phy == ERR_PTR(-ENODEV)) if (phy == ERR_PTR(-ENODEV))
return PTR_ERR(phy); return PTR_ERR(phy);
if (IS_ERR(phy)) { if (IS_ERR(phy)) {
dev_err(sfp->dev, "mdiobus scan returned %ld\n", PTR_ERR(phy)); dev_err(sfp->dev, "mdiobus scan returned %pe\n", phy);
return PTR_ERR(phy); return PTR_ERR(phy);
} }
err = phy_device_register(phy); err = phy_device_register(phy);
if (err) { if (err) {
phy_device_free(phy); phy_device_free(phy);
dev_err(sfp->dev, "phy_device_register failed: %d\n", err); dev_err(sfp->dev, "phy_device_register failed: %pe\n",
ERR_PTR(err));
return err; return err;
} }
...@@ -1531,7 +1533,7 @@ static int sfp_sm_probe_phy(struct sfp *sfp, bool is_c45) ...@@ -1531,7 +1533,7 @@ static int sfp_sm_probe_phy(struct sfp *sfp, bool is_c45)
if (err) { if (err) {
phy_device_remove(phy); phy_device_remove(phy);
phy_device_free(phy); phy_device_free(phy);
dev_err(sfp->dev, "sfp_add_phy failed: %d\n", err); dev_err(sfp->dev, "sfp_add_phy failed: %pe\n", ERR_PTR(err));
return err; return err;
} }
...@@ -1708,7 +1710,7 @@ static int sfp_sm_mod_hpower(struct sfp *sfp, bool enable) ...@@ -1708,7 +1710,7 @@ static int sfp_sm_mod_hpower(struct sfp *sfp, bool enable)
err = sfp_read(sfp, true, SFP_EXT_STATUS, &val, sizeof(val)); err = sfp_read(sfp, true, SFP_EXT_STATUS, &val, sizeof(val));
if (err != sizeof(val)) { if (err != sizeof(val)) {
dev_err(sfp->dev, "Failed to read EEPROM: %d\n", err); dev_err(sfp->dev, "Failed to read EEPROM: %pe\n", ERR_PTR(err));
return -EAGAIN; return -EAGAIN;
} }
...@@ -1726,7 +1728,8 @@ static int sfp_sm_mod_hpower(struct sfp *sfp, bool enable) ...@@ -1726,7 +1728,8 @@ static int sfp_sm_mod_hpower(struct sfp *sfp, bool enable)
err = sfp_write(sfp, true, SFP_EXT_STATUS, &val, sizeof(val)); err = sfp_write(sfp, true, SFP_EXT_STATUS, &val, sizeof(val));
if (err != sizeof(val)) { if (err != sizeof(val)) {
dev_err(sfp->dev, "Failed to write EEPROM: %d\n", err); dev_err(sfp->dev, "Failed to write EEPROM: %pe\n",
ERR_PTR(err));
return -EAGAIN; return -EAGAIN;
} }
...@@ -1778,7 +1781,9 @@ static int sfp_cotsworks_fixup_check(struct sfp *sfp, struct sfp_eeprom_id *id) ...@@ -1778,7 +1781,9 @@ static int sfp_cotsworks_fixup_check(struct sfp *sfp, struct sfp_eeprom_id *id)
id->base.connector = SFF8024_CONNECTOR_LC; id->base.connector = SFF8024_CONNECTOR_LC;
err = sfp_write(sfp, false, SFP_PHYS_ID, &id->base, 3); err = sfp_write(sfp, false, SFP_PHYS_ID, &id->base, 3);
if (err != 3) { if (err != 3) {
dev_err(sfp->dev, "Failed to rewrite module EEPROM: %d\n", err); dev_err(sfp->dev,
"Failed to rewrite module EEPROM: %pe\n",
ERR_PTR(err));
return err; return err;
} }
...@@ -1789,7 +1794,9 @@ static int sfp_cotsworks_fixup_check(struct sfp *sfp, struct sfp_eeprom_id *id) ...@@ -1789,7 +1794,9 @@ static int sfp_cotsworks_fixup_check(struct sfp *sfp, struct sfp_eeprom_id *id)
check = sfp_check(&id->base, sizeof(id->base) - 1); check = sfp_check(&id->base, sizeof(id->base) - 1);
err = sfp_write(sfp, false, SFP_CC_BASE, &check, 1); err = sfp_write(sfp, false, SFP_CC_BASE, &check, 1);
if (err != 1) { if (err != 1) {
dev_err(sfp->dev, "Failed to update base structure checksum in fiber module EEPROM: %d\n", err); dev_err(sfp->dev,
"Failed to update base structure checksum in fiber module EEPROM: %pe\n",
ERR_PTR(err));
return err; return err;
} }
} }
...@@ -1814,12 +1821,13 @@ static int sfp_sm_mod_probe(struct sfp *sfp, bool report) ...@@ -1814,12 +1821,13 @@ static int sfp_sm_mod_probe(struct sfp *sfp, bool report)
ret = sfp_read(sfp, false, 0, &id.base, sizeof(id.base)); ret = sfp_read(sfp, false, 0, &id.base, sizeof(id.base));
if (ret < 0) { if (ret < 0) {
if (report) if (report)
dev_err(sfp->dev, "failed to read EEPROM: %d\n", ret); dev_err(sfp->dev, "failed to read EEPROM: %pe\n",
ERR_PTR(ret));
return -EAGAIN; return -EAGAIN;
} }
if (ret != sizeof(id.base)) { if (ret != sizeof(id.base)) {
dev_err(sfp->dev, "EEPROM short read: %d\n", ret); dev_err(sfp->dev, "EEPROM short read: %pe\n", ERR_PTR(ret));
return -EAGAIN; return -EAGAIN;
} }
...@@ -1839,13 +1847,15 @@ static int sfp_sm_mod_probe(struct sfp *sfp, bool report) ...@@ -1839,13 +1847,15 @@ static int sfp_sm_mod_probe(struct sfp *sfp, bool report)
ret = sfp_read(sfp, false, 0, &id.base, sizeof(id.base)); ret = sfp_read(sfp, false, 0, &id.base, sizeof(id.base));
if (ret < 0) { if (ret < 0) {
if (report) if (report)
dev_err(sfp->dev, "failed to read EEPROM: %d\n", dev_err(sfp->dev,
ret); "failed to read EEPROM: %pe\n",
ERR_PTR(ret));
return -EAGAIN; return -EAGAIN;
} }
if (ret != sizeof(id.base)) { if (ret != sizeof(id.base)) {
dev_err(sfp->dev, "EEPROM short read: %d\n", ret); dev_err(sfp->dev, "EEPROM short read: %pe\n",
ERR_PTR(ret));
return -EAGAIN; return -EAGAIN;
} }
} }
...@@ -1887,12 +1897,13 @@ static int sfp_sm_mod_probe(struct sfp *sfp, bool report) ...@@ -1887,12 +1897,13 @@ static int sfp_sm_mod_probe(struct sfp *sfp, bool report)
ret = sfp_read(sfp, false, SFP_CC_BASE + 1, &id.ext, sizeof(id.ext)); ret = sfp_read(sfp, false, SFP_CC_BASE + 1, &id.ext, sizeof(id.ext));
if (ret < 0) { if (ret < 0) {
if (report) if (report)
dev_err(sfp->dev, "failed to read EEPROM: %d\n", ret); dev_err(sfp->dev, "failed to read EEPROM: %pe\n",
ERR_PTR(ret));
return -EAGAIN; return -EAGAIN;
} }
if (ret != sizeof(id.ext)) { if (ret != sizeof(id.ext)) {
dev_err(sfp->dev, "EEPROM short read: %d\n", ret); dev_err(sfp->dev, "EEPROM short read: %pe\n", ERR_PTR(ret));
return -EAGAIN; return -EAGAIN;
} }
...@@ -2046,7 +2057,8 @@ static void sfp_sm_module(struct sfp *sfp, unsigned int event) ...@@ -2046,7 +2057,8 @@ static void sfp_sm_module(struct sfp *sfp, unsigned int event)
err = sfp_hwmon_insert(sfp); err = sfp_hwmon_insert(sfp);
if (err) if (err)
dev_warn(sfp->dev, "hwmon probe failed: %d\n", err); dev_warn(sfp->dev, "hwmon probe failed: %pe\n",
ERR_PTR(err));
sfp_sm_mod_next(sfp, SFP_MOD_WAITDEV, 0); sfp_sm_mod_next(sfp, SFP_MOD_WAITDEV, 0);
fallthrough; fallthrough;
......
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