From patchwork Thu Oct 6 05:32:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Leroy X-Patchwork-Id: 12999990 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 9EF31C433FE for ; Thu, 6 Oct 2022 05:32:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230144AbiJFFcV (ORCPT ); Thu, 6 Oct 2022 01:32:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41602 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230059AbiJFFcU (ORCPT ); Thu, 6 Oct 2022 01:32:20 -0400 Received: from pegase2.c-s.fr (pegase2.c-s.fr [93.17.235.10]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9A5F18A7CB; Wed, 5 Oct 2022 22:32:17 -0700 (PDT) Received: from localhost (mailhub3.si.c-s.fr [172.26.127.67]) by localhost (Postfix) with ESMTP id 4Mjg7365n6z9srM; Thu, 6 Oct 2022 07:32:15 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from pegase2.c-s.fr ([172.26.127.65]) by localhost (pegase2.c-s.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BBw-GaoHTb0D; Thu, 6 Oct 2022 07:32:15 +0200 (CEST) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase2.c-s.fr (Postfix) with ESMTP id 4Mjg735Bf1z9srL; Thu, 6 Oct 2022 07:32:15 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 98B568B765; Thu, 6 Oct 2022 07:32:15 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id 7mp3JBzDTH5l; Thu, 6 Oct 2022 07:32:15 +0200 (CEST) Received: from PO20335.IDSI0.si.c-s.fr (unknown [192.168.232.234]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 6A8DC8B763; Thu, 6 Oct 2022 07:32:15 +0200 (CEST) Received: from PO20335.IDSI0.si.c-s.fr (localhost [127.0.0.1]) by PO20335.IDSI0.si.c-s.fr (8.17.1/8.16.1) with ESMTPS id 2965W12r212478 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Thu, 6 Oct 2022 07:32:01 +0200 Received: (from chleroy@localhost) by PO20335.IDSI0.si.c-s.fr (8.17.1/8.17.1/Submit) id 2965W0BI212477; Thu, 6 Oct 2022 07:32:00 +0200 X-Authentication-Warning: PO20335.IDSI0.si.c-s.fr: chleroy set sender to christophe.leroy@csgroup.eu using -f From: Christophe Leroy To: Finn Thain , Michael Schmitz , "James E.J. Bottomley" , "Martin K. Petersen" Cc: Christophe Leroy , linux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org Subject: [PATCH] scsi: mac_scsi: Replace NO_IRQ by 0 Date: Thu, 6 Oct 2022 07:32:00 +0200 Message-Id: X-Mailer: git-send-email 2.37.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1665034319; l=1720; s=20211009; h=from:subject:message-id; bh=eXtfh1J1qDXaXAXSJZOMjCbd65v9KlkYmL7nMCnCJQk=; b=VP7cTuxbFIB/m12IaWne/FUOukr8uNjLZCtd9xWgumlb+8TaXaNE/njuxGRXqeFiybaQ3t1sS8lI 4i5UWsKQD1rLQCBLopHbjaPN85QE0u6iFkwuavgk7QjSfUh3/fzZ X-Developer-Key: i=christophe.leroy@csgroup.eu; a=ed25519; pk=HIzTzUj91asvincQGOFx6+ZF5AoUuP9GdOtQChs7Mm0= Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org NO_IRQ is used to check the return of irq_of_parse_and_map(). On some architecture NO_IRQ is 0, on other architectures it is -1. irq_of_parse_and_map() returns 0 on error, independent of NO_IRQ. So use 0 instead of using NO_IRQ. Signed-off-by: Christophe Leroy --- drivers/scsi/mac_scsi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/mac_scsi.c b/drivers/scsi/mac_scsi.c index 2e511697fce3..e4df2b501e8b 100644 --- a/drivers/scsi/mac_scsi.c +++ b/drivers/scsi/mac_scsi.c @@ -478,7 +478,7 @@ static int __init mac_scsi_probe(struct platform_device *pdev) if (irq) instance->irq = irq->start; else - instance->irq = NO_IRQ; + instance->irq = 0; hostdata = shost_priv(instance); hostdata->base = pio_mem->start; @@ -495,7 +495,7 @@ static int __init mac_scsi_probe(struct platform_device *pdev) if (error) goto fail_init; - if (instance->irq != NO_IRQ) { + if (instance->irq) { error = request_irq(instance->irq, macscsi_intr, IRQF_SHARED, "NCR5380", instance); if (error) @@ -514,7 +514,7 @@ static int __init mac_scsi_probe(struct platform_device *pdev) return 0; fail_host: - if (instance->irq != NO_IRQ) + if (instance->irq) free_irq(instance->irq, instance); fail_irq: NCR5380_exit(instance); @@ -528,7 +528,7 @@ static int __exit mac_scsi_remove(struct platform_device *pdev) struct Scsi_Host *instance = platform_get_drvdata(pdev); scsi_remove_host(instance); - if (instance->irq != NO_IRQ) + if (instance->irq) free_irq(instance->irq, instance); NCR5380_exit(instance); scsi_host_put(instance);