From patchwork Mon Dec 5 10:35:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Divya Koppera X-Patchwork-Id: 29634 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp2172714wrr; Mon, 5 Dec 2022 02:41:26 -0800 (PST) X-Google-Smtp-Source: AA0mqf6agT4CYay/orpE6tEFoEwK8mVQRxqe9aIIzyM8KzlbXQrhMvuk2Q0mIOWh7dGEImfWHotK X-Received: by 2002:a17:902:d102:b0:189:c3ef:c752 with SMTP id w2-20020a170902d10200b00189c3efc752mr12075950plw.118.1670236885942; Mon, 05 Dec 2022 02:41:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670236885; cv=none; d=google.com; s=arc-20160816; b=DEkb5kUtC9/TGjSNY9L5QqevhKcFSgoBNpob7zTyg2hGF5iMJrdhKP+0Ql0t81kXDr 7NbEeIkt/GQjAPppzVmzTME+Lk6bowySQXEKuV8AoM4xXHJlB6SIxMczFj6FlM2UitRM q1ilQJn9Od8U1MrRziuoWS5gEIuczjCUfHn+MMuMzLn1sOydznlN8F+OQ8N6MoGzeQJ6 NgQk9vwDoxjRJ8GusCFHWHbZ0cpkPmiYqCxaHW6Ga2AuS4RXYMjAVFpeAZhfL8/Y9WjK Q5sql3psQGBtauiphJAKIiAys1gjuTHqPAHPcAgJhBVCOhkLHmMhm7lAC4oPr+UBIJcj QGew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=B4d/19KsJ7V7rjyMCeT1AxxQJxgeokrTdTeeDcgVpjY=; b=R7JN1D383rYwPQ7Mv40INxQzhzDZFQyp+7ZXDj9nBa7D4CTzvfRn4X4Kt8GlCxG22d o7HggJD90HRk+nPGrnjIRHY/nMvZ49P5NyYiuZxUo2/VOHd0QdU/slB0wV7jExcWdjaN 6U3xfeMyhqfHb4JkChj6b8tAOXw6rrd8mybU0yYzTwhC8Dl6MIdjSQ6nPSBV88Oj8ia9 Vqo89D1g/tTsknA9UFaIePi3cE5NPsEdmQdV7FpjTD7bs37eDl/tQ+0HBhqmQBbUX5cH NVV01Zu/5+jqM+GLyTSaF36Jt92cNg8yo/Xmw7c4rl4l/tO9z07FuYOGclLogfNi5eYO OwhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microchip.com header.s=mchp header.b=Hz7LpFtP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=microchip.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n2-20020a170902e54200b0017b3392ca72si15268318plf.323.2022.12.05.02.41.13; Mon, 05 Dec 2022 02:41:25 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@microchip.com header.s=mchp header.b=Hz7LpFtP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=microchip.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231140AbiLEKgX (ORCPT + 99 others); Mon, 5 Dec 2022 05:36:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38142 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231421AbiLEKgR (ORCPT ); Mon, 5 Dec 2022 05:36:17 -0500 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.154.123]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1DA9419C09; Mon, 5 Dec 2022 02:36:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1670236571; x=1701772571; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=waNbGc0Ld373BAhdnffhgd8xkY87Ov6KnlpB/JVxuaA=; b=Hz7LpFtPZqXJZsIDDNL5WSQ3rxRHqJm9De0wzBnxlHLYpGb8TyNvqtLp 2UqGPJtpLqkeP6n720HIPe5y4xyOJ4nnV4hC1o2L5esSjKpeAuQyDkGWx XbLQuZ//0h177AhbyFc2kKqDHKP6snVnWAqHozKf+r7GPmISo8KZvAzg/ B4zISQ1k+tyU1yXuJzVAyBE4+yKLbh2EwPojM7j7b2FbFLSZfKHdtcphP y+TxWB4EpTgGEPU8cWB/ESELrJchCdyzumBz3J8Fu9nBW4rs//BYHof44 TATSQRa6/jgxRdYtCHOBxpw44jhazZueQVx7TFcuQfiqE/DdEsuL2VDPK g==; X-IronPort-AV: E=Sophos;i="5.96,219,1665471600"; d="scan'208";a="190035808" Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa2.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 05 Dec 2022 03:36:10 -0700 Received: from chn-vm-ex04.mchp-main.com (10.10.85.152) by chn-vm-ex02.mchp-main.com (10.10.85.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.12; Mon, 5 Dec 2022 03:36:07 -0700 Received: from training-HP-280-G1-MT-PC.microchip.com (10.10.115.15) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server id 15.1.2507.12 via Frontend Transport; Mon, 5 Dec 2022 03:36:03 -0700 From: Divya Koppera To: , , , , , , , , , CC: , Subject: [PATCH v4 net-next 2/2] net: phy: micrel: Fix warn: passing zero to PTR_ERR Date: Mon, 5 Dec 2022 16:05:50 +0530 Message-ID: <20221205103550.24944-3-Divya.Koppera@microchip.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221205103550.24944-1-Divya.Koppera@microchip.com> References: <20221205103550.24944-1-Divya.Koppera@microchip.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1751370312653838121?= X-GMAIL-MSGID: =?utf-8?q?1751370312653838121?= 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 --- 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 | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c index 1bcdb828db56..0399f3830700 100644 --- a/drivers/net/phy/micrel.c +++ b/drivers/net/phy/micrel.c @@ -2971,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 = 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->ptp_clock) return; lanphy_write_page_reg(phydev, 5, TSU_HARD_RESET, TSU_HARD_RESET_); @@ -3017,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); @@ -3040,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;