From patchwork Wed Dec 14 09:25:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Divya Koppera X-Patchwork-Id: 13072896 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B247AC4332F for ; Wed, 14 Dec 2022 09:26:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237793AbiLNJZ7 (ORCPT ); Wed, 14 Dec 2022 04:25:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39884 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229463AbiLNJZu (ORCPT ); Wed, 14 Dec 2022 04:25:50 -0500 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.154.123]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D75905588; Wed, 14 Dec 2022 01:25:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1671009950; x=1702545950; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=YtXgmwGITvaQ7XHc3VNhGjroTZdn8sTxHBJidSjWEMg=; b=PJM+8nD8CH6SInnb0yM+rAivKHWHYgKzxyp6KSueI9sc7A/9pa61sJwH SYsrNDH41gO+DoP1j56A5TJo6+AypMLI/7rJSJgL2dKCgPuc7gEs43xQh /IXs8s/3kq7iH7k2F5CfSXLa4tTjZGd8OKqOs5efbZr3aCjFnPnC+99Sl NrT8KpivPWZ+r0QiPVa5XEzKj6uck152VNnU21fE3kOScYw8YD8ofB/Uc 76Qr9vWWoEpn/cokLcvon5EkiCA5mQhnDUqpF8lxn7RuBU+QrrDMFNx+t Co7hUzeB/ZmWAlARvwgXRaQmDK9aTqJPQ3zJvF+fZWhOdHL6mfJ7tPieb A==; X-IronPort-AV: E=Sophos;i="5.96,244,1665471600"; d="scan'208";a="188100269" Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa4.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 14 Dec 2022 02:25:49 -0700 Received: from chn-vm-ex03.mchp-main.com (10.10.85.151) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16; Wed, 14 Dec 2022 02:25:43 -0700 Received: from training-HP-280-G1-MT-PC.microchip.com (10.10.115.15) by chn-vm-ex03.mchp-main.com (10.10.85.151) with Microsoft SMTP Server id 15.1.2507.16 via Frontend Transport; Wed, 14 Dec 2022 02:25:39 -0700 From: Divya Koppera To: , , , , , , , , , CC: Subject: [RESEND PATCH v5 net-next 1/2] net: phy: micrel: Fixed error related to uninitialized symbol ret Date: Wed, 14 Dec 2022 14:55:23 +0530 Message-ID: <20221214092524.21399-2-Divya.Koppera@microchip.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221214092524.21399-1-Divya.Koppera@microchip.com> References: <20221214092524.21399-1-Divya.Koppera@microchip.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Initialized return variable Fixes Old smatch warnings: drivers/net/phy/micrel.c:1750 ksz886x_cable_test_get_status() error: uninitialized symbol 'ret'. Reported-by: kernel test robot Reported-by: Dan Carpenter Fixes: 21b688dabecb ("net: phy: micrel: Cable Diag feature for lan8814 phy") Reviewed-by: Andrew Lunn Signed-off-by: Divya Koppera --- 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(-) -- 2.17.1 diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c index 26ce0c5defcd..1bcdb828db56 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; From patchwork Wed Dec 14 09:25:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Divya Koppera X-Patchwork-Id: 13072897 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9CD76C4332F for ; Wed, 14 Dec 2022 09:26:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237907AbiLNJ0A (ORCPT ); Wed, 14 Dec 2022 04:26:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39902 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237180AbiLNJZv (ORCPT ); Wed, 14 Dec 2022 04:25:51 -0500 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.154.123]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 808271D648; Wed, 14 Dec 2022 01:25:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1671009951; x=1702545951; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=xyc4x/K6bFavC9UZAWslWQocjusdPMbCBREoUlViGU0=; b=TultIts98M9DVLhkshwK7NriAEp7Y/9yC00DAshP77xsSTzkIWDxgv4i RxVWmt80TKv5fao+C350TC8OR4YWwheLBOEUN/4uMU4v3SOadWtCMQEql uccaN3nCVixIviUaOw5qSH13GwEc27ypb30H2xEhQPHYvSsufnM2ihdy5 dOFmHulIkFL5l6Jk6teW/Df8pL8V/biQlw70tRcictnwDyM3MiyminwU2 TTYAKZSruraG89jrKQ7oa+qQ9b39+A3LzS+ITTKCLXu7UFRKlFA9zNkVH pg5MLWB54iipNyACFKg3JtRGV/puONVOROh+o9a9SSdWXeFNAQVBMVdkJ Q==; X-IronPort-AV: E=Sophos;i="5.96,244,1665471600"; d="scan'208";a="188100271" Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa4.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 14 Dec 2022 02:25:50 -0700 Received: from chn-vm-ex03.mchp-main.com (10.10.85.151) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16; Wed, 14 Dec 2022 02:25:47 -0700 Received: from training-HP-280-G1-MT-PC.microchip.com (10.10.115.15) by chn-vm-ex03.mchp-main.com (10.10.85.151) with Microsoft SMTP Server id 15.1.2507.16 via Frontend Transport; Wed, 14 Dec 2022 02:25:43 -0700 From: Divya Koppera To: , , , , , , , , , CC: Subject: [RESEND PATCH v5 net-next 2/2] net: phy: micrel: Fix warn: passing zero to PTR_ERR Date: Wed, 14 Dec 2022 14:55:24 +0530 Message-ID: <20221214092524.21399-3-Divya.Koppera@microchip.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221214092524.21399-1-Divya.Koppera@microchip.com> References: <20221214092524.21399-1-Divya.Koppera@microchip.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org 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' vim +/PTR_ERR +2613 drivers/net/phy/micrel.c Reported-by: kernel test robot Reported-by: Dan Carpenter Fixes: ece19502834d ("net: phy: micrel: 1588 support for LAN8814 phy") Signed-off-by: Divya Koppera Reviewed-by: Alexander Duyck --- 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(-) -- 2.17.1 diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c index 1bcdb828db56..650ef53fcf20 100644 --- a/drivers/net/phy/micrel.c +++ b/drivers/net/phy/micrel.c @@ -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;