Fixed warnings
Subsystems (3)
v5 cover Fixed warnings
Fixed warnings related to PTR_ERR and initialization.
Divya Koppera (2):
net: phy: micrel: Fixed error related to uninitialized symbol ret
net: phy: micrel: Fix warn: passing zero to PTR_ERR
drivers/net/phy/micrel.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
--
2.17.1
PATCH RESEND v5 1/2 net: phy: micrel: Fixed error related to uninitialized symbol ret
Initialized return variable
Fixes Old smatch warnings:drivers/net/phy/micrel.c:1750 ksz886x_cable_test_get_status() error:
uninitialized symbol 'ret'.
---
v4 -> v5:
- No changes, added reviewed by tag.
v3 -> v4:
- Split the patch for different warnings.
v1 -> v3:
- No changes
--- drivers/net/phy/micrel.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/phy/micrel.c +2 -1
@@ -2088,7 +2088,8 @@ static int ksz886x_cable_test_get_status(struct phy_device *phydev,const struct kszphy_type *type = phydev->drv->driver_data;unsigned long pair_mask = type->pair_mask;int retries =20 ; -int pair, ret; +int ret =0 ; +int pair; *finished = false;
--
2.17.1
PATCH RESEND v5 2/2 net: phy: micrel: Fix warn: passing zero to PTR_ERR
In reply to Divya KopperaHandle the NULL pointer case
Fixes New smatch warnings:drivers/net/phy/micrel.c:2613 lan8814_ptp_probe_once() warn: passing zero to 'PTR_ERR'
vim +/PTR_ERR +2613 drivers/net/phy/micrel.c
---
v4 -> v5:
- Removed run time check and added compile time check for PHC
v3 -> v4:
- Split the patch for different warnings
- Renamed variable from shared_priv to shared.
v2 -> v3:
- Changed subject line from net to net-next
- Removed config check for ptp and clock configuration instead added null check for ptp_clock
- Fixed one more warning related to initialisaton.
v1 -> v2:
- Handled NULL pointer case
- Changed subject line with net-next to net
--- drivers/net/phy/micrel.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/net/phy/micrel.c +5 -5
@@ -3017,10 +3017,6 @@ static int lan8814_ptp_probe_once(struct phy_device *phydev) {struct lan8814_shared_priv *shared = phydev->shared->priv; -if (!IS_ENABLED (CONFIG_PTP_1588_CLOCK ) || - !IS_ENABLED (CONFIG_NETWORK_PHY_TIMESTAMPING )) -return 0 ; -/* Initialise shared lock for clock*/ mutex_init (&shared->shared_lock);
@@ -3040,12 +3036,16 @@ static int lan8814_ptp_probe_once(struct phy_device *phydev) shared->ptp_clock =ptp_clock_register (&shared->ptp_clock_info, &phydev->mdio.dev); -if (IS_ERR_OR_NULL (shared->ptp_clock)) { +if (IS_ERR (shared->ptp_clock)) {phydev_err (phydev,"ptp_clock_register failed %lu\n" ,PTR_ERR (shared->ptp_clock));return -EINVAL ; } +/* Check if PHC support is missing at the configuration level */ +if (!shared->ptp_clock) +return 0 ; +phydev_dbg (phydev,"successfully registered ptp clock\n" ); shared->phydev = phydev;
--
2.17.1
Re: [RESEND PATCH v5 net-next 2/2] net: phy: micrel: Fix warn: passing zero to PTR_ERR
Quoted 55 lines · Divya Koppera
Handle the NULL pointer case
Fixes New smatch warnings:
drivers/net/phy/micrel.c:2613lan8814_ptp_probe_once()warn: passing zero to 'PTR_ERR'vim +/PTR_ERR +2613
drivers/net/phy/micrel.cReported-by kernel test robot <[email protected]>Reported-by Dan Carpenter <[email protected]>Fixes ece19502834d ("net: phy: micrel: 1588 support for LAN8814 phy")Signed-off-by Divya Koppera <[email protected]>---
v4 -> v5:
- Removed run time check and added compile time check for PHCv3 -> v4:
- Split the patch for different warnings
- Renamed variable fromshared_privto shared.v2 -> v3:
- Changed subject line from net to net-next
- Removed config check for ptp and clock configuration instead added null check forptp_clock
- Fixed one more warning related to initialisaton.v1 -> v2:
- Handled NULL pointer case
- Changed subject line with net-next to net--- drivers/net/phy/micrel.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)drivers/net/phy/micrel.c +1
-5@@ -3017,10 +3017,6 @@ static int lan8814_ptp_probe_once(struct phy_device *phydev) {struct lan8814_shared_priv *shared = phydev->shared->priv; -if (!IS_ENABLED (CONFIG_PTP_1588_CLOCK ) || - !IS_ENABLED (CONFIG_NETWORK_PHY_TIMESTAMPING )) -return 0 ; -/* Initialise shared lock for clock*/ mutex_init (&shared->shared_lock);@@ -3040,12 +3036,16 @@ static int lan8814_ptp_probe_once(struct phy_device *phydev) shared->ptp_clock =ptp_clock_register (&shared->ptp_clock_info, &phydev->mdio.dev); -if (IS_ERR_OR_NULL (shared->ptp_clock)) { +if (IS_ERR (shared->ptp_clock)) {phydev_err (phydev,"ptp_clock_register failed %lu\n" ,PTR_ERR (shared->ptp_clock));
drivers/net/phy/micrel.c static int lan8814_ptp_probe_once(struct phy_device *phydev) · line 3051
Quoted 10 lines
drivers/net/phy/micrel.c +4
-0return -EINVAL ; } +/* Check if PHC support is missing at the configuration level */ +if (!shared->ptp_clock) +return 0 ; +phydev_dbg (phydev,"successfully registered ptp clock\n" ); shared->phydev = phydev;
Looks good to me. You may need to resubmit once net-next opens.
Jakub Kicinski
maintainerRe: [RESEND PATCH v5 net-next 2/2] net: phy: micrel: Fix warn: passing zero to PTR_ERR
Quoted 1 line · On Thu, 15 Dec 2022 07:58:57 -0800 Alexander H Duyck wrote:
Looks good to me. You may need to resubmit once net-next opens.
And please drop the Fixes tags when reposting. Both patches look like placating static analysis tools but there's not real issue.