Received: by 2002:a25:683:0:0:0:0:0 with SMTP id 125csp1143592ybg; Tue, 2 Jun 2020 02:26:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyZxbmCkDU5qx9XSgy2yCoxZiaCiOOAOj5Suv/gIfIDvr2Ok1hDALICONr4UMGp0+r7XOK7 X-Received: by 2002:aa7:d388:: with SMTP id x8mr10463068edq.380.1591089998616; Tue, 02 Jun 2020 02:26:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1591089998; cv=none; d=google.com; s=arc-20160816; b=xIPttBu+2oLZxZX8ofvKWqyEQVdpBcTND79hjqxbZ4/4HG/Gc7diXRZooc71wS0/P/ 0KyjrReLcSUDabM7jO9AN+xlpfVbDzDQR929m1cMhp7zCG/PUcgBwW4hJLuwY6GstCAj P+5Bi2OKItkeXi+fESERMrG9mIqIY/j2Lf9nKKTWDb/ulTC4Zk7rSGLUjth3PDLqOin9 KmIdhlher+CGnB4AU5i/a8dbKzxyjpFxAtJ33U14SvCanHi+StPSZthwXX8gc++9Izi9 J2RA1nc7xxZTK5xLpZSn1zyY2DeH+6lgvGTVC+ffM4gWAutcEmu8b65hBThavOt7e7wW /aWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :ironport-sdr:ironport-sdr; bh=iTJzc5MrWKttY9isanclozKYAST9/jRw7PznbQ1FZGk=; b=NSUuVuD+ZFCfYhRg3LavN4BIwHVOlVmaisx9CjhHljRPeidIfTIIz6vvnSQDoFXoU4 fMtaux82kCV5b9KxwIKwHsq0GTQXETJ5HVnW9otNOoOEWFJpM8FsjjsHUAMnh+vWeVb5 lgT5hY3Wsr6SsgIyGYq67l+qIMU33sOXSbaYF0/voBoJtHmRZgl0fDCF6PEqkBKsrm0j 6uUw5FCAHAGU0f4l9/dhMiYrQHN/F0j8YofAUFS1LDCwHY3rBgG1FS6fK4MkscJ2AL2U db7Y5Di22k+O8joAtSx0luCY6pbmO8jFt6iLWItu/nhwnWogy0lfpm7+0bL9bU+NmyLu nfAg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id l10si1336541edi.562.2020.06.02.02.26.15; Tue, 02 Jun 2020 02:26:38 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728299AbgFBJVc (ORCPT + 99 others); Tue, 2 Jun 2020 05:21:32 -0400 Received: from mga03.intel.com ([134.134.136.65]:55922 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726485AbgFBJVb (ORCPT ); Tue, 2 Jun 2020 05:21:31 -0400 IronPort-SDR: /Q4VtJXGsIiU5kWrWVLmplyue0lVFlWoSOQfmDp5ldBHEBvB8kjgbsZj+VDf9eQOSywOdQIW2P Df1lqZnoNOoQ== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Jun 2020 02:21:31 -0700 IronPort-SDR: Zk4p6UqDmqIfERpDP4fvJX3Mqub+M0OjDj1bzssxGtQb4VtxnI/D/+3/6aPJz6AUcBLkkMI4xT nFKvkvO8qguw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,463,1583222400"; d="scan'208";a="444621658" Received: from gklab-125-110.igk.intel.com ([10.91.125.110]) by orsmga005.jf.intel.com with ESMTP; 02 Jun 2020 02:21:29 -0700 From: Piotr Stankiewicz To: Brian King , "James E . J . Bottomley" , "Martin K . Petersen" , Jim Gill , VMware PV-Drivers Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, Piotr Stankiewicz Subject: [PATCH 15/15] scsi: use PCI_IRQ_MSI_TYPES and PCI_IRQ_ALL_TYPES where appropriate Date: Tue, 2 Jun 2020 11:21:26 +0200 Message-Id: <20200602092126.32327-1-piotr.stankiewicz@intel.com> X-Mailer: git-send-email 2.17.2 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Seeing as there is shorthand available to use when asking for any type of interrupt, or any type of message signalled interrupt, leverage it. Signed-off-by: Piotr Stankiewicz Reviewed-by: Andy Shevchenko --- drivers/scsi/ipr.c | 2 +- drivers/scsi/vmw_pvscsi.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c index d48a8fa997b9..666dcf196d07 100644 --- a/drivers/scsi/ipr.c +++ b/drivers/scsi/ipr.c @@ -10275,7 +10275,7 @@ static int ipr_probe_ioa(struct pci_dev *pdev, irq_flag = PCI_IRQ_LEGACY; if (ioa_cfg->ipr_chip->has_msi) - irq_flag |= PCI_IRQ_MSI | PCI_IRQ_MSIX; + irq_flag |= PCI_IRQ_MSI_TYPES; rc = pci_alloc_irq_vectors(pdev, 1, ipr_number_of_msix, irq_flag); if (rc < 0) { ipr_wait_for_pci_err_recovery(ioa_cfg); diff --git a/drivers/scsi/vmw_pvscsi.c b/drivers/scsi/vmw_pvscsi.c index c3f010df641e..825b7db9c713 100644 --- a/drivers/scsi/vmw_pvscsi.c +++ b/drivers/scsi/vmw_pvscsi.c @@ -1347,7 +1347,7 @@ static u32 pvscsi_get_max_targets(struct pvscsi_adapter *adapter) static int pvscsi_probe(struct pci_dev *pdev, const struct pci_device_id *id) { - unsigned int irq_flag = PCI_IRQ_MSIX | PCI_IRQ_MSI | PCI_IRQ_LEGACY; + unsigned int irq_flag = PCI_IRQ_ALL_TYPES; struct pvscsi_adapter *adapter; struct pvscsi_adapter adapter_temp; struct Scsi_Host *host = NULL; -- 2.17.2