From patchwork Sun Dec 12 07:13:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miaoqian Lin X-Patchwork-Id: 12695792 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 C8C62C433EF for ; Sun, 12 Dec 2021 07:14: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: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id: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:In-Reply-To:References: List-Owner; bh=fEEBZ7jMH5pap05AiVqc4qgUZaUb1JLtFDCjwOWwG1Q=; b=G25u2rEsNTPC0n 7dFuY1h/I8uHavrYky3+AAIWau4tK85ziI5oi1DtrqIYRwigMPZaIr22YjU8lnPx2TRs7qfDUr88c 03/kHd7Bxke/bmgdGIIpqw07arcIFC8GzMfhzKh0Wnru/7mZC7fIfEcBpByXuUWfo6qnFa6XV/G2A dr3ivyNuxs1MPKbEHqKyegqDMRFMmZHsJgSbz3o1mwTpOxyebYlKOXs3DRL8sY1t5ByeRnHMcm67C wM0+wIK/49yKMa9CaNhf+PFzMgkcsN+wIWW2rMFshsqahgzfw1QP0sJ0uelIkj1sbI5GhQ0FxILfS RosAeAp2RaZEN8JhMzDA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mwJ2j-0064a4-RM; Sun, 12 Dec 2021 07:13:10 +0000 Received: from mail-pl1-x635.google.com ([2607:f8b0:4864:20::635]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mwJ2g-0064Zc-I7 for linux-arm-kernel@lists.infradead.org; Sun, 12 Dec 2021 07:13:07 +0000 Received: by mail-pl1-x635.google.com with SMTP id u11so9050453plf.3 for ; Sat, 11 Dec 2021 23:13:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id; bh=qdg39eHfEjgfTHjVmWVrh1tDLpzFxy2xokCMGc3PcsM=; b=k3gIJKUwy6PhPyYIRiAOoO+2QlhuxvSstook8wMpjAFqsxJzN3Iaf/XhqG1zMP/b2v wK7z78hvfA9rSAjcsjd0wyi2apj6XnmEcPkKLXwkSgPYnpROwaK/OIp0R06TXT7y6AEE 4FDx438DBGnNqU5r7uVNnXZcTB+YowFfJrvbcFVERYUooFp0HjjT3Xg5AnULrrm4Hc0y 5mZklh9GiAtNLE5b2rwTr+BPB5UXXCcWlPGr8MraTic71t8lM7q0TnsV6yJKw0a/6naI v54bXnCuXPMsHxyfE2QoHAgEV+tKdrHj1uTTHtpt7s/XmgcLzmNeqA1+v0PhWX3tIokH dMlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=qdg39eHfEjgfTHjVmWVrh1tDLpzFxy2xokCMGc3PcsM=; b=uX2a6vhhrTpHRSg7UndPVrhBCPTP2j4uHOyQzmQENxViRQwj25DZhjmviGqibQ5bP2 Jt/jD7AcMx4GIxglPwWe4PF5MWD3W2fsh3r4mcoTxqa33jh0o/EbyNJ814cQzbGZYsn9 1exLRtSX74NhCHMUotL/sLf/iC/q1oBdPwz+F9hO9tH3bpuV5sXNrM9J9K0R1HVAAr9M wIU2lP/Av7Z4CdE4ygixFBSb5UgnT6qY0MlpAzSKm/lXgup0XOAb+/QmqbMa7/tndezS k0LDwAJMO6cePfks1OPtSO3TKVwWUIZWOWAmy0gVupMiCfaHyeNULiRdTBVMX/2eR+jy +NRQ== X-Gm-Message-State: AOAM5325UDQTJmZas3PlKls0oeUpGpS2DkkedrL9jKyp95G8w7oYmoxj znqhLHieJFY2jBKFmmehnoE= X-Google-Smtp-Source: ABdhPJwMdHCo8kdfDCPsid7zLYY1GMC/QkpaujbeCrKtcCFxp3LBdGprlYeoUVeNjzVTR6Bj7s9P9A== X-Received: by 2002:a17:903:2291:b0:142:b53:6e08 with SMTP id b17-20020a170903229100b001420b536e08mr87208497plh.10.1639293185825; Sat, 11 Dec 2021 23:13:05 -0800 (PST) Received: from localhost.localdomain ([159.226.95.43]) by smtp.googlemail.com with ESMTPSA id g1sm7740572pfu.73.2021.12.11.23.13.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Dec 2021 23:13:05 -0800 (PST) From: Miaoqian Lin To: Cc: linmq006@gmail.com, Nishanth Menon , Santosh Shilimkar , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH] soc: ti: Fix NULL vs IS_ERR() checking in dma_init Date: Sun, 12 Dec 2021 07:13:01 +0000 Message-Id: <20211212071301.3011-1-linmq006@gmail.com> X-Mailer: git-send-email 2.17.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211211_231306_641351_6DBB0E9E X-CRM114-Status: GOOD ( 11.31 ) 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: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Since devm_ioremap_resource() function return error pointers. The pktdma_get_regs() function does not return NULL, It return error pointers too. Using IS_ERR() to check the return value to fix this. Signed-off-by: Miaoqian Lin --- drivers/soc/ti/knav_dma.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/soc/ti/knav_dma.c b/drivers/soc/ti/knav_dma.c index 591d14ebcb11..9f82cf906949 100644 --- a/drivers/soc/ti/knav_dma.c +++ b/drivers/soc/ti/knav_dma.c @@ -646,31 +646,31 @@ static int dma_init(struct device_node *cloud, struct device_node *dma_node) } dma->reg_global = pktdma_get_regs(dma, node, 0, &size); - if (!dma->reg_global) - return -ENODEV; + if (IS_ERR(dma->reg_global)) + return PTR_ERR(dma->reg_global); if (size < sizeof(struct reg_global)) { dev_err(kdev->dev, "bad size %pa for global regs\n", &size); return -ENODEV; } dma->reg_tx_chan = pktdma_get_regs(dma, node, 1, &size); - if (!dma->reg_tx_chan) - return -ENODEV; + if (IS_ERR(dma->reg_tx_cha)) + return PTR_ERR(dma->reg_tx_cha); max_tx_chan = size / sizeof(struct reg_chan); dma->reg_rx_chan = pktdma_get_regs(dma, node, 2, &size); - if (!dma->reg_rx_chan) - return -ENODEV; + if (IS_ERR(dma->reg_rx_chan)) + return PTR_ERR(dma->reg_rx_chan); max_rx_chan = size / sizeof(struct reg_chan); dma->reg_tx_sched = pktdma_get_regs(dma, node, 3, &size); - if (!dma->reg_tx_sched) - return -ENODEV; + if (IS_ERR(dma->reg_tx_sched)) + return PTR_ERR(dma->reg_tx_sched); max_tx_sched = size / sizeof(struct reg_tx_sched); dma->reg_rx_flow = pktdma_get_regs(dma, node, 4, &size); - if (!dma->reg_rx_flow) - return -ENODEV; + if (IS_ERR(dma->reg_rx_flow)) + return PTR_ERR(dma->reg_rx_flow); max_rx_flow = size / sizeof(struct reg_rx_flow); dma->rx_priority = DMA_PRIO_DEFAULT;