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 X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 08603C32771 for ; Fri, 24 Jan 2020 09:41:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C81C220718 for ; Fri, 24 Jan 2020 09:41:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579858898; bh=tSOs9vBLSvpqOlgLYN1HfY7+L8HdAKMmDVMNCl8Xkk4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=LKrX4WfruEinko8fL46ca0CMqCNKG8nn6OIA21GFmjRuzOEN4iRoA7aDoCucNT9Yl IGsxzYtFw9Y74crs+2wXaaZh5FUkH/LrQLo6yMP3qQMX5mL/HUNGX+jYsFXz0by1vf LzXeFtHzqoYGQF1u4QqH26fSfsUxKj4kRtvPQo74= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732965AbgAXJli (ORCPT ); Fri, 24 Jan 2020 04:41:38 -0500 Received: from mail.kernel.org ([198.145.29.99]:39036 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732273AbgAXJle (ORCPT ); Fri, 24 Jan 2020 04:41:34 -0500 Received: from localhost (unknown [145.15.244.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 523D6208C4; Fri, 24 Jan 2020 09:41:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579858893; bh=tSOs9vBLSvpqOlgLYN1HfY7+L8HdAKMmDVMNCl8Xkk4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xW+lHV55q1JWq8Kp1hi8+lTV3IhuiM7psAdCDBTHo5wzFsxWWaJje7urlsudkqjFF RePl5zqHtpiIoPfrTbdKBcM/K+4QG6YSXa+fQiY6IYBabEAKOuGLgOOJAtpYhAaSPL QxgpVWg5fs9E/05zGORCTa8Z/Yap1CADbpRuRXHQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Wei Yongjun , Radhey Shyam Pandey , "David S. Miller" , Sasha Levin Subject: [PATCH 5.4 076/102] net: axienet: Fix error return code in axienet_probe() Date: Fri, 24 Jan 2020 10:31:17 +0100 Message-Id: <20200124092818.129800710@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124092806.004582306@linuxfoundation.org> References: <20200124092806.004582306@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Wei Yongjun [ Upstream commit eb34e98baf4ce269423948dacefea6747e963b48 ] In the DMA memory resource get failed case, the error is not set and 0 will be returned. Fix it by removing redundant check since devm_ioremap_resource() will handle it. Fixes: 28ef9ebdb64c ("net: axienet: make use of axistream-connected attribute optional") Signed-off-by: Wei Yongjun Reviewed-by: Radhey Shyam Pandey Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c index 676006f32f913..479325eeaf8a0 100644 --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c @@ -1790,10 +1790,6 @@ static int axienet_probe(struct platform_device *pdev) /* Check for these resources directly on the Ethernet node. */ struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 1); - if (!res) { - dev_err(&pdev->dev, "unable to get DMA memory resource\n"); - goto free_netdev; - } lp->dma_regs = devm_ioremap_resource(&pdev->dev, res); lp->rx_irq = platform_get_irq(pdev, 1); lp->tx_irq = platform_get_irq(pdev, 0); -- 2.20.1