From patchwork Fri Jan 6 08:29:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Divya Koppera X-Patchwork-Id: 13091063 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 580E9C54E76 for ; Fri, 6 Jan 2023 08:29:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232120AbjAFI3V (ORCPT ); Fri, 6 Jan 2023 03:29:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46574 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231838AbjAFI3S (ORCPT ); Fri, 6 Jan 2023 03:29:18 -0500 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.153.233]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1FE1265AD5; Fri, 6 Jan 2023 00:29:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1672993758; x=1704529758; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=glt2/hIaYrE5Dt1m5RibjZdA+M4Bt00OAWcsQL3Agfk=; b=BZGEUSoTR/zwneIjVHOQB0pAQChx4wP6zWRO28LeOBZR+zlPw/2dIrRC o5yuirk1BjhDjCyBKHcurdfCGlGBMZwfmCW/NG5axwJAJrchzd3rDZUC4 t4PGxkUdJmbOHgO4+SlLsNGZg0jPU26TseQBXhnc+sBT6B12aTMATzE5U ezghMljKSTgg6YcE9Wngfir15+d6YC2sTTKsPjYs3DE3FiukfnKP3whD+ LCtqKizIiiK8DylVtXrjdo8t+/rFceHPx16osGZDDLwSpAHgKbro0mYmN tfG0wJpjeW6IcYWc7tCV35k6msa/imncxI34vIxkq1blF1UgwfbVAZ7oF g==; X-IronPort-AV: E=Sophos;i="5.96,304,1665471600"; d="scan'208";a="195664087" Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa5.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 06 Jan 2023 01:29:17 -0700 Received: from chn-vm-ex03.mchp-main.com (10.10.85.151) by chn-vm-ex03.mchp-main.com (10.10.85.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16; Fri, 6 Jan 2023 01:29:17 -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; Fri, 6 Jan 2023 01:29:13 -0700 From: Divya Koppera To: , , , , , , , , , , CC: Subject: [PATCH v6 net-next 1/2] net: phy: micrel: Fixed error related to uninitialized symbol ret Date: Fri, 6 Jan 2023 13:59:04 +0530 Message-ID: <20230106082905.1159-2-Divya.Koppera@microchip.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230106082905.1159-1-Divya.Koppera@microchip.com> References: <20230106082905.1159-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 Reviewed-by: Andrew Lunn Signed-off-by: Divya Koppera --- v5 -> v6: - Removed fixes tag as this is fixing static analysis issus and not a real fix. 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(-) 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 Fri Jan 6 08:29:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Divya Koppera X-Patchwork-Id: 13091064 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 E1AC6C5479D for ; Fri, 6 Jan 2023 08:29:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232255AbjAFI3f (ORCPT ); Fri, 6 Jan 2023 03:29:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46648 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232180AbjAFI3X (ORCPT ); Fri, 6 Jan 2023 03:29:23 -0500 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.153.233]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 596187A920; Fri, 6 Jan 2023 00:29:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1672993762; x=1704529762; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=OKsrMUds3JwbloBzsKaWTIBxPZJcQykKaE7DFA0jHmc=; b=U/xWVyOHxgN8UVNgCoxjkPp5/PDVkvNqKEUqvkOXELYdMdLnmprncL2z 19xtwCs/rpAOXFp5Xhe/V6wLn3zq6bCkXtkmTy70WOyutJt29FEWWaFpf tfN9+Qsv3LXg4w+PexnnqtTw2PVG+hio7PbCBLNuxxMJkGzBSQ5Uf0h0P MnBsIyy/wfMdCcV8s4ynolUn90AMLdk2tkj64JQI+5XVj92X+6Q35RvQf Wsh9n5L5rzpYPADVzZDd7YuVCeu8I8APaJfb+b7GpyLbBRnnfAtvnmus9 Ew8H/fl3EgyqD9PgiyXDTCg4Ukzf6IwFrmgazsFjLphiT3F83UnCRTkNB Q==; X-IronPort-AV: E=Sophos;i="5.96,304,1665471600"; d="scan'208";a="195562570" Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa3.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 06 Jan 2023 01:29:21 -0700 Received: from chn-vm-ex03.mchp-main.com (10.10.85.151) by chn-vm-ex03.mchp-main.com (10.10.85.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16; Fri, 6 Jan 2023 01:29:21 -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; Fri, 6 Jan 2023 01:29:17 -0700 From: Divya Koppera To: , , , , , , , , , , CC: Subject: [PATCH v6 net-next 2/2] net: phy: micrel: Fix warn: passing zero to PTR_ERR Date: Fri, 6 Jan 2023 13:59:05 +0530 Message-ID: <20230106082905.1159-3-Divya.Koppera@microchip.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230106082905.1159-1-Divya.Koppera@microchip.com> References: <20230106082905.1159-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 Reviewed-by: Alexander Duyck Signed-off-by: Divya Koppera --- v5 -> v6: - Removed fixes tag as this is to fix static analysis issues and not real fix. 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(-) 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;