From mboxrd@z Thu Jan 1 00:00:00 1970 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4F527CCA471 for ; Tue, 30 Sep 2025 12:16:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type: Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date :Subject:CC:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=eQzqneoZALoPGRFFvWnZ1GCMXeesYcgJGLBteg4QWxo=; b=ppBe+WfQ7OZoOJ6NMl8IMWdFFV DboxQQJXtTlV2eZUd3//lQpbyspv4wo6OddGDyitM8X8GK6oIjBxRWJohuwsYbejkKHMeEAsqTZrN vEMaxtFArWtVw9jfMSrk1HRqOcFq7drrvFj5r6ldjBJP9qrvEY2UjSGqotoY5WOMKb64JbD9Lzc37 HjKCzUN3bOyKpl1vO/tKdqAVWZlEE8xnB/xh5tIONjBpYvi6xNC+HwvccD9r5RVMlr5ghS1UTMgGZ 7YRsr5uEQPYiO2Dxo4RYtw2QMB3ZTxOPSVCZOKCP38KUIxLq6U+dveFgkjL0dudBSIwerfLq0x0nk lttmjclQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1v3ZHb-00000005EHY-3Qgv; Tue, 30 Sep 2025 12:16:39 +0000 Received: from lelvem-ot01.ext.ti.com ([198.47.23.234]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1v3ZHZ-00000005EGC-0Dx0 for linux-arm-kernel@lists.infradead.org; Tue, 30 Sep 2025 12:16:38 +0000 Received: from fllvem-sh04.itg.ti.com ([10.64.41.54]) by lelvem-ot01.ext.ti.com (8.15.2/8.15.2) with ESMTP id 58UCGMx92452077; Tue, 30 Sep 2025 07:16:22 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1759234582; bh=eQzqneoZALoPGRFFvWnZ1GCMXeesYcgJGLBteg4QWxo=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=OMS2Lnj6FEor2tCevR6C+qzWpPC+o/QsQtq9zVQUzTKMyECBB3WhrBccgi2b/KKqw nwgf7BXupzcCobH2nqiFN4sUrQXWAJGWM9f7M4ojdjtAKRbYcpGIpshfSLsz4hd1CA fkTlr51YaGx0NVas4PfQmUfwuxqlP46xLaq5q2Yg= Received: from DLEE102.ent.ti.com (dlee102.ent.ti.com [157.170.170.32]) by fllvem-sh04.itg.ti.com (8.18.1/8.18.1) with ESMTPS id 58UCGMWZ3905820 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA256 bits=128 verify=FAIL); Tue, 30 Sep 2025 07:16:22 -0500 Received: from DLEE207.ent.ti.com (157.170.170.95) by DLEE102.ent.ti.com (157.170.170.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.55; Tue, 30 Sep 2025 07:16:21 -0500 Received: from lelvem-mr06.itg.ti.com (10.180.75.8) by DLEE207.ent.ti.com (157.170.170.95) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20 via Frontend Transport; Tue, 30 Sep 2025 07:16:21 -0500 Received: from localhost (uda0133052.dhcp.ti.com [128.247.81.232]) by lelvem-mr06.itg.ti.com (8.18.1/8.18.1) with ESMTP id 58UCGLSp2892158; Tue, 30 Sep 2025 07:16:21 -0500 From: Nishanth Menon To: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , Paolo Abeni , Jakub Kicinski , Eric Dumazet , "David S. Miller" , Andrew Lunn CC: Santosh Shilimkar , Simon Horman , Siddharth Vadapalli , , , , Nishanth Menon Subject: [PATCH V2 1/3] net: ethernet: ti: netcp: Handle both ERR_PTR and NULL from knav_dma_open_channel Date: Tue, 30 Sep 2025 07:16:07 -0500 Message-ID: <20250930121609.158419-2-nm@ti.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20250930121609.158419-1-nm@ti.com> References: <20250930121609.158419-1-nm@ti.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-C2ProcessedOrg: 333ef613-75bf-4e12-a4b1-8e3623f5dcea X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250930_051637_216031_6516F5DC X-CRM114-Status: GOOD ( 13.18 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The knav_dma_open_channel function has inconsistent return behavior: the header returns NULL when the driver is disabled, while the driver implementation returns ERR_PTR(-EINVAL). This inconsistency creates confusion for callers. Prepare for standardizing the function to return NULL by updating callers to handle both ERR_PTR and NULL return values using IS_ERR_OR_NULL() checks. Suggested-by: Simon Horman Signed-off-by: Nishanth Menon --- Changes in V2: * renewed version drivers/net/ethernet/ti/netcp_core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/ti/netcp_core.c b/drivers/net/ethernet/ti/netcp_core.c index 857820657bac..2f9d26c791e3 100644 --- a/drivers/net/ethernet/ti/netcp_core.c +++ b/drivers/net/ethernet/ti/netcp_core.c @@ -1338,10 +1338,10 @@ int netcp_txpipe_open(struct netcp_tx_pipe *tx_pipe) tx_pipe->dma_channel = knav_dma_open_channel(dev, tx_pipe->dma_chan_name, &config); - if (IS_ERR(tx_pipe->dma_channel)) { + if (IS_ERR_OR_NULL(tx_pipe->dma_channel)) { dev_err(dev, "failed opening tx chan(%s)\n", tx_pipe->dma_chan_name); - ret = PTR_ERR(tx_pipe->dma_channel); + ret = -EINVAL; goto err; } @@ -1678,10 +1678,10 @@ static int netcp_setup_navigator_resources(struct net_device *ndev) netcp->rx_channel = knav_dma_open_channel(netcp->netcp_device->device, netcp->dma_chan_name, &config); - if (IS_ERR(netcp->rx_channel)) { + if (IS_ERR_OR_NULL(netcp->rx_channel)) { dev_err(netcp->ndev_dev, "failed opening rx chan(%s\n", netcp->dma_chan_name); - ret = PTR_ERR(netcp->rx_channel); + ret = -EINVAL; goto fail; } -- 2.47.0