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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 77C1AC433F5 for ; Wed, 16 Mar 2022 14:18:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1356551AbiCPOUD (ORCPT ); Wed, 16 Mar 2022 10:20:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44492 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1356757AbiCPOTZ (ORCPT ); Wed, 16 Mar 2022 10:19:25 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 591246A01F; Wed, 16 Mar 2022 07:17:39 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 717B76112F; Wed, 16 Mar 2022 14:17:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 104E2C340E9; Wed, 16 Mar 2022 14:17:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647440257; bh=U1RN+qcuU9O2LCspDevbAQrWN3ktOW7z/Tg19+h8DqQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qM6g6OSxkulF/qpFN1x7uD0t2MqJFGW97PRxmZBJFAi1fKBrCrr3sm8g2RrUu+m15 CvpblpSCO0fJC8x+UojxZBOVcZm+Xuc2SvQp2zs9L00uQxthAyzjzf/inKDVcSqSRi v5zQ+dapmyKbOZiEoJYia3Sjr8DTy61YGIvRJCl952HDGPWOGWtxEamH8LJjraOMqL 6i93Kak1Os6w2UolreogYbAkcUMt3HmLgsefVt4X+9QXSxyHNXKwTQuqq1D27YsPfT RM0Sw9QJlV1yXyFZqKWNptPjltyREWAvMo8R4oLi+aFhgI14k2ZwI7Js9vISP4TjwG wFK/uGJxDO3ng== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "Minghao Chi (CGEL ZTE)" , Zeal Robot , "David S . Miller" , Sasha Levin , kuba@kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.10 12/12] net:mcf8390: Use platform_get_irq() to get the interrupt Date: Wed, 16 Mar 2022 10:16:36 -0400 Message-Id: <20220316141636.248324-12-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220316141636.248324-1-sashal@kernel.org> References: <20220316141636.248324-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: "Minghao Chi (CGEL ZTE)" [ Upstream commit 2a760554dcba450d3ad61b32375b50ed6d59a87c ] It is not recommened to use platform_get_resource(pdev, IORESOURCE_IRQ) for requesting IRQ's resources any more, as they can be not ready yet in case of DT-booting. platform_get_irq() instead is a recommended way for getting IRQ even if it was not retrieved earlier. It also makes code simpler because we're getting "int" value right away and no conversion from resource to int is required. Reported-by: Zeal Robot Signed-off-by: Minghao Chi (CGEL ZTE) Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/8390/mcf8390.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/8390/mcf8390.c b/drivers/net/ethernet/8390/mcf8390.c index 4ad8031ab669..065fdbe66c42 100644 --- a/drivers/net/ethernet/8390/mcf8390.c +++ b/drivers/net/ethernet/8390/mcf8390.c @@ -406,12 +406,12 @@ static int mcf8390_init(struct net_device *dev) static int mcf8390_probe(struct platform_device *pdev) { struct net_device *dev; - struct resource *mem, *irq; + struct resource *mem; resource_size_t msize; - int ret; + int ret, irq; - irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0); - if (irq == NULL) { + irq = platform_get_irq(pdev, 0); + if (irq < 0) { dev_err(&pdev->dev, "no IRQ specified?\n"); return -ENXIO; } @@ -434,7 +434,7 @@ static int mcf8390_probe(struct platform_device *pdev) SET_NETDEV_DEV(dev, &pdev->dev); platform_set_drvdata(pdev, dev); - dev->irq = irq->start; + dev->irq = irq; dev->base_addr = mem->start; ret = mcf8390_init(dev); -- 2.34.1