From patchwork Tue Dec 14 01:55:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miaoqian Lin X-Patchwork-Id: 12696012 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 5CAB6C433EF for ; Tue, 14 Dec 2021 01:57: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: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=2KarlYIVL75+nN9lvy8ej69Yq+fC8eZd/9Wqc2omWLE=; b=I3np9YWEzWlNGY Dk4dCCcyd2GT3K0449/EW+ZsCaVMwlXd6U0sVZLsDT0LYIxngr66YFH7HZbtG7rqffJKzzzIQUvXW P1I3CeD+hnTnT4ber0674TL+IVPeOynjejQQnWh1pn6nSBLiyUdVg0GWpko2l8REWa6/dZR2OVQdO H9vEEQkn7C3kw9v71m58L1z7ZIWgYH3B+G8QhfSejqgtybwvg7816opxrQRurZuJ8/RpPArcw4EN+ ffkLrDolwM6NKguJE3g5Z4k2oJoY1rPgUTshKWEktQwilxk5tUxarCk/UfSefYWyjKMl5aK1eG5UM CBBsZg/vCDFd32jEyRoA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mwx31-00CCn2-HC; Tue, 14 Dec 2021 01:56:08 +0000 Received: from mail-pj1-x1033.google.com ([2607:f8b0:4864:20::1033]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mwx2v-00CClz-3P for linux-arm-kernel@lists.infradead.org; Tue, 14 Dec 2021 01:56:02 +0000 Received: by mail-pj1-x1033.google.com with SMTP id j6-20020a17090a588600b001a78a5ce46aso16052676pji.0 for ; Mon, 13 Dec 2021 17:56:00 -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:in-reply-to:references; bh=Qd49u8wZsRuwLaXyCJuNAMzGQxG0yqJmrsLKRB+38eQ=; b=hyAocIG8TqYW+LyROpSx3OS+R3VKabbtaVBhPL6RMHb+2J5l9dpsYLu4/gvvtBODTq R9u12IrAh7st+x+iqTPpefzkqKfeLDwxU7/dxDaroXSIWiB+W+LUDHL/5V6Gt/jYe3O/ rHOYgKtpDpVP6GEcZpVNDe2U2TpoEEf+HW4yNREEc14tHXvLWv4z9hh698tDEsDazvkJ iVQARizsD1JFZRVQtfAtvTRwtgP6C+dcUMKpJ+PAI/Y1cPMaviZSuEqNqf6trpw2QbPW 0JR/EtOQza2UY8WvDHzjUJhgssTOjUBpVvwM5HhB1mgZZtFSDt8/mwcFM7JrwGwiEhSx 7q9w== 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:in-reply-to :references; bh=Qd49u8wZsRuwLaXyCJuNAMzGQxG0yqJmrsLKRB+38eQ=; b=JphVC1gkxS0dhba4NGOatQikeUgxjJWVtWPjFokElPw++B2AwynkNwqf1Dw+Vjldxd vqrXuHhTI/kabuf24YgLAuIJAq2P663Fe7ut77mUeVBaNq1EDmSA2BsHoPBk11EkryKo u5BzJic04AShEMjetodj/XPyirlIPocf5+tfe1CTV/xMaQIh230bt0otQnhBXmKP7otm r5OHFg6pQKGWutwlvVBeDK9/PqxbU6EeA2aI82r6XZETwdiLQDGQ9ESZ/aSrfV8pehyD wTHG4/IOEKpZ7qDq9uhL7v/1zM1uSV8e8byfNDK7m11vp1qSUxWA0O7jGFjN76h/NhUN TXRw== X-Gm-Message-State: AOAM531BJ9BY+6j6B5zGPOvV2cgcQYJtJ8vrzZJZ4h8sW/7x2FOGjuvz OZ5xpCzJO5b/CtIMiqF+FGM= X-Google-Smtp-Source: ABdhPJzIiabpGW2GfeqGi2N6EBXjHWbYQi37VWQIxET8e8I08a4riu7TZlH6x0UE2OO3RAmRej+XtQ== X-Received: by 2002:a17:90b:4c8d:: with SMTP id my13mr2208298pjb.107.1639446960391; Mon, 13 Dec 2021 17:56:00 -0800 (PST) Received: from localhost.localdomain ([159.226.95.43]) by smtp.googlemail.com with ESMTPSA id x1sm11136063pgh.1.2021.12.13.17.55.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Dec 2021 17:56:00 -0800 (PST) From: Miaoqian Lin To: nm@ti.com Cc: linmq006@gmail.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, ssantosh@kernel.org Subject: [PATCH v2] soc: ti: Fix NULL vs IS_ERR() checking in dma_init Date: Tue, 14 Dec 2021 01:55:44 +0000 Message-Id: <20211214015544.7270-1-linmq006@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211213155930.mcxlc5m3niqh77xi@annotate> References: <20211213155930.mcxlc5m3niqh77xi@annotate> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211213_175601_188638_997752D7 X-CRM114-Status: GOOD ( 13.05 ) 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. --- Changes in v2: fix wrong variable name. --- 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..700d8eecd8c4 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_chan)) + return PTR_ERR(dma->reg_tx_chan); 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;