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 94DFEC433F5 for ; Wed, 9 Mar 2022 05:38:58 +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:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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=Jv6+fCtSkYq4EEoYVPXgAnsYE3KVep1GS7vuKfacffg=; b=hQ4gGseiUwR3pS CMIg24RSSCfbCzTsd6ReNR6UFDqMnViiK1wVMsgTfLmbbTYsUBuvsuHeUAfwKfmAFlcWbWgruxHHi 743zDO7U4SYRL95EgxGvwOS04JyWnku41GSHKYPErwAJ1mUpLCIQ71Jri/UmWk4DkSK/nddsG7nXc BdWdS3e43r5trt89MQuumQCVlOXj7eebOgL5s8tcVNNL0LYsjAz/UZ4OBZP+sjV9U7Vj1/eXnJPqJ 9EKm8FVj2FxUt0iNJX6lM8cyugkgioMLz2NU8uqb6je83PnkNYOMNW1hyX1mJXCRPsCEglEaUHUlX hYuvfZ72I8CwdyD1wxrA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nRp14-007MpF-Hs; Wed, 09 Mar 2022 05:37:42 +0000 Received: from mail-qv1-xf2c.google.com ([2607:f8b0:4864:20::f2c]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nRp11-007MoT-BZ for linux-arm-kernel@lists.infradead.org; Wed, 09 Mar 2022 05:37:40 +0000 Received: by mail-qv1-xf2c.google.com with SMTP id b12so1239010qvk.1 for ; Tue, 08 Mar 2022 21:37:38 -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:mime-version :content-transfer-encoding; bh=ZsAdyEXRI2fprv2zVOJpXzajm9rrZywAumRIFm2mze0=; b=oFYFga8k/HlIBFE206iPp4pwPH8a4cgdN/hl+9ziS++S1x+V9FMC5s7OXUnVw1u0cv fVJRhdaN/AD9DmTHsRjXzu/9LzIAIvOEkSW58NF/EB8mdQA8K2EGu7O0eSpznARXCbn6 1T0AboaKn45uAHtVU+jliQtLKQrD8C4I/ggzDkKX5PEYa22wPS7DVIkD4lI3as8/DXV+ QSlZZsKzgDNWgemgE8S5Ai2CjR8bkrjnHh6cgzrZc8IRCV7V7wDNXaxuPzWiuxRd4lmm F147oMl1bAVrp+HRTpHJQmSN/dT2nmQYXockeXKUedfvsZgYl/933HmLZ6YxMjqNI1Wb N94w== 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:mime-version :content-transfer-encoding; bh=ZsAdyEXRI2fprv2zVOJpXzajm9rrZywAumRIFm2mze0=; b=DeB34azNeoAHmCGmhjk2kNKPj3LAa4drcIjHv8Es5fBc3jwDMri+UM5AnJFdWdrWrk LL6sg3gXhSwRWg9oxK1K6BKzszicCEf5Agg0pZ6M+qqsBuNvaH+2MylvUAvdsbYvyXs8 Ndkz0Y2WapmZL3vatNQGyRCSdPO1KaAMdV84ULBALHCxNplPgXx3GPrmuAKO8Fy7dvn6 Xlt0WH63Upstl+6J2wpVITJh4Cfjgk3P125Rgy8/qislDqV6Pp8cSzZJ3FIWS5BUJ7nA Bquyr97BKbBKprJemUFRT7NNR2QmcoaV9Psw/bhGiS4Cig9dbhxc8YU/QfHM+NWYgT+x 3pxA== X-Gm-Message-State: AOAM533wCghdUl6rQuyXYdHvOIN536vnTtmWFK53IJ/iu7MonaRCLzlv AtZuEQ8zgvI4XfhHos0/+QqUlhyV/os= X-Google-Smtp-Source: ABdhPJyJr4Q0Kdl/XKudXwMVIgpmw0iTMVTpgP5Zm5uquMOUnBAjsO3HfFb9wXdMnaCunZB1cU1MXg== X-Received: by 2002:a0c:f801:0:b0:427:47d3:3715 with SMTP id r1-20020a0cf801000000b0042747d33715mr15196166qvn.46.1646804257952; Tue, 08 Mar 2022 21:37:37 -0800 (PST) Received: from localhost.localdomain ([193.203.214.57]) by smtp.gmail.com with ESMTPSA id n143-20020a37a495000000b0067b12bc1d7bsm541304qke.13.2022.03.08.21.37.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Mar 2022 21:37:37 -0800 (PST) From: cgel.zte@gmail.com X-Google-Original-From: chi.minghao@zte.com.cn To: linux@dominikbrodowski.net Cc: f.fainelli@gmail.com, bcm-kernel-feedback-list@broadcom.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Minghao Chi , Zeal Robot Subject: [PATCH] pcmcia: Use platform_get_irq() to get the interrupt Date: Wed, 9 Mar 2022 05:37:32 +0000 Message-Id: <20220309053732.2081252-1-chi.minghao@zte.com.cn> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220308_213739_426066_AE0EDBCB X-CRM114-Status: GOOD ( 14.92 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Minghao Chi 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 --- drivers/pcmcia/bcm63xx_pcmcia.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/pcmcia/bcm63xx_pcmcia.c b/drivers/pcmcia/bcm63xx_pcmcia.c index 16f573173471..bb06311d0b5f 100644 --- a/drivers/pcmcia/bcm63xx_pcmcia.c +++ b/drivers/pcmcia/bcm63xx_pcmcia.c @@ -327,10 +327,11 @@ static int bcm63xx_drv_pcmcia_probe(struct platform_device *pdev) { struct bcm63xx_pcmcia_socket *skt; struct pcmcia_socket *sock; - struct resource *res, *irq_res; + struct resource *res; unsigned int regmem_size = 0, iomem_size = 0; u32 val; int ret; + int irq; skt = kzalloc(sizeof(*skt), GFP_KERNEL); if (!skt) @@ -342,9 +343,9 @@ static int bcm63xx_drv_pcmcia_probe(struct platform_device *pdev) /* make sure we have all resources we need */ skt->common_res = platform_get_resource(pdev, IORESOURCE_MEM, 1); skt->attr_res = platform_get_resource(pdev, IORESOURCE_MEM, 2); - irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); + irq = platform_get_irq(pdev, 0); skt->pd = pdev->dev.platform_data; - if (!skt->common_res || !skt->attr_res || !irq_res || !skt->pd) { + if (!skt->common_res || !skt->attr_res || (irq < 0) || !skt->pd) { ret = -EINVAL; goto err; } @@ -380,7 +381,7 @@ static int bcm63xx_drv_pcmcia_probe(struct platform_device *pdev) sock->dev.parent = &pdev->dev; sock->features = SS_CAP_STATIC_MAP | SS_CAP_PCCARD; sock->io_offset = (unsigned long)skt->io_base; - sock->pci_irq = irq_res->start; + sock->pci_irq = irq; #ifdef CONFIG_CARDBUS sock->cb_dev = bcm63xx_cb_dev; -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel