lkml.org 
[lkml]   [2022]   [Nov]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH v3 net-next] net: phy: micrel: Fix warn: passing zero to PTR_ERR
The 11/29/2022 15:46, Divya Koppera wrote:

Hi Divya,

> Handle the NULL pointer case
>
> Fixes New smatch warnings:
> drivers/net/phy/micrel.c:2613 lan8814_ptp_probe_once() warn: passing zero to 'PTR_ERR'
>
> Fixes Old smatch warnings:
> drivers/net/phy/micrel.c:1750 ksz886x_cable_test_get_status() error:
> uninitialized symbol 'ret'.

Shouldn't you split this patch in 2 different patches, as you fix 2
issues.
Also any reason why you target net-next and not net? Because I can
see the blamed patches on net branch.

>
> vim +/PTR_ERR +2613 drivers/net/phy/micrel.c
> Reported-by: kernel test robot <lkp@intel.com>
> Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
> Fixes: ece19502834d ("net: phy: micrel: 1588 support for LAN8814 phy")
> Fixes: 21b688dabecb ("net: phy: micrel: Cable Diag feature for lan8814 phy")
> Signed-off-by: Divya Koppera <Divya.Koppera@microchip.com>
> ---
> 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 | 18 ++++++++++--------
> 1 file changed, 10 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
> index 26ce0c5defcd..3703e2fafbd4 100644
> --- a/drivers/net/phy/micrel.c
> +++ b/drivers/net/phy/micrel.c
> @@ -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;
>
> @@ -2970,12 +2971,13 @@ static int lan8814_config_intr(struct phy_device *phydev)
>
> static void lan8814_ptp_init(struct phy_device *phydev)
> {
> + struct lan8814_shared_priv *shared_priv = phydev->shared->priv;
> struct kszphy_priv *priv = phydev->priv;
> struct kszphy_ptp_priv *ptp_priv = &priv->ptp_priv;
> u32 temp;
>
> - if (!IS_ENABLED(CONFIG_PTP_1588_CLOCK) ||
> - !IS_ENABLED(CONFIG_NETWORK_PHY_TIMESTAMPING))
> + /* Check if PHC support is missing at the configuration level */
> + if (!shared_priv->ptp_clock)
> return;
>
> lanphy_write_page_reg(phydev, 5, TSU_HARD_RESET, TSU_HARD_RESET_);
> @@ -3016,10 +3018,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);
>
> @@ -3039,12 +3037,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
>

--
/Horatiu

\
 
 \ /
  Last update: 2022-11-30 15:46    [W:0.046 / U:0.044 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site