Received: by 2002:a25:683:0:0:0:0:0 with SMTP id 125csp438512ybg; Wed, 3 Jun 2020 04:54:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwTDaqdAqknj+Mzdm46O2tpchepV0vprBRo5edw9qDeFFOZtEjXMFK4jZBiLehcTTM53k1G X-Received: by 2002:aa7:c403:: with SMTP id j3mr11474278edq.294.1591185243842; Wed, 03 Jun 2020 04:54:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1591185243; cv=none; d=google.com; s=arc-20160816; b=uaP+/RT0lPEO2poAB8RVEnwjTFC0dh7MzZpDpOYc6nDjeJi8mXE6MR6joStGvP2AZM H0DDoqCA07tFHJFa6s2wSZOUc2u+v415J2P/NT28ozhYLtLqq2e1n1bS+Xu3jfFmT5ZU SHY0chydsAp6TWYyzEiHCeiaAmGV3eW5cNWeCsfVwcoYPwTFjRxP7uhKJIIwJs+aPmKo QMJ5SCKuESMvYdYRCBlXDPfoP60ZJ6z+l5JI5v+o3q6Mp0QZ+oMTUl0Tucim8/yI5yfl 0fmJhCxxLYzu5koJL/Ou2ZyoKFe362siTekcVyQg1lMsHt+1n4RgC3wVAR2UuSr8zT3N mpfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:ironport-sdr:ironport-sdr; bh=fxlw4tOmmgax+lnwOFtPM+/Vvs1Jyt3dh8DlmiEkXDI=; b=tXVhncwlbaqxaFqsPUwFOX9L/igSczeXZm+E3nBChDBku0CKkFkDBEBRSJterVXBXa Y62KlLKpxj6uvKlVZpyJvU5GFSmMNrmM1o/osETf/AjiCPf81LM5ogdLanURJUs+MnyB rMpZsdXAq24XtP9T9PoWzx3oqpJV5S9Cit2YDUMvhqHfzx9o0QzILMK+3QiI4iTTG9EL /h6ku81k8TAK6+c3tGL9ctcoYtBuyo2Vln7ScVjef/K4YNnN1xh/TsFHrQzVH8X7eHAj LaHR0UlpIHg2ibFuJjKiXSuKz8Wkge9N3U0HfQIBlmgR7JblDtLrEJYdvyI7zOMZLYjy JYkA== 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 w23si930257edv.71.2020.06.03.04.53.41; Wed, 03 Jun 2020 04:54:03 -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 S1726363AbgFCLuK (ORCPT + 99 others); Wed, 3 Jun 2020 07:50:10 -0400 Received: from mga14.intel.com ([192.55.52.115]:5625 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725959AbgFCLuJ (ORCPT ); Wed, 3 Jun 2020 07:50:09 -0400 IronPort-SDR: 5n0TzM5hZlLd+qoq2uDEZn6zW0GFs9BYAfnQyufdqc5byc7DcETsNiJkGidmTXO6TGLJRPWHmi 3GNlMhlCbo5g== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jun 2020 04:50:09 -0700 IronPort-SDR: rjz6sjJuksB3FUZFHwtSPCFgTQNaTjuyYCffhA9Yy2klRAHJrhXomb/NmttnOhBsQYTp+FpgPr R1Bs52peKK2g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,467,1583222400"; d="scan'208";a="416538253" Received: from gklab-125-110.igk.intel.com ([10.91.125.110]) by orsmga004.jf.intel.com with ESMTP; 03 Jun 2020 04:50:05 -0700 From: Piotr Stankiewicz To: Bjorn Helgaas , linux-pci@vger.kernel.org Cc: Piotr Stankiewicz , Yisen Zhuang , Salil Mehta , "David S. Miller" , Jakub Kicinski , Huazhong Tan , Peng Li , Jian Shen , Yunsheng Lin , Guojia Liao , Yufeng Mo , Yonglong Liu , Guangbin Huang , Weihang Li , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 14/15] net: hns3: Use PCI_IRQ_MSI_TYPES where appropriate Date: Wed, 3 Jun 2020 13:49:59 +0200 Message-Id: <20200603115002.13874-1-piotr.stankiewicz@intel.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20200603114212.12525-1-piotr.stankiewicz@intel.com> References: <20200603114212.12525-1-piotr.stankiewicz@intel.com> 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/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 3 +-- drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c index a758f9ae32be..c49313e87170 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c @@ -2334,8 +2334,7 @@ static int hclge_init_msi(struct hclge_dev *hdev) int i; vectors = pci_alloc_irq_vectors(pdev, HNAE3_MIN_VECTOR_NUM, - hdev->num_msi, - PCI_IRQ_MSI | PCI_IRQ_MSIX); + hdev->num_msi, PCI_IRQ_MSI_TYPES); if (vectors < 0) { dev_err(&pdev->dev, "failed(%d) to allocate MSI/MSI-X vectors\n", diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c index e02d427131ee..2b02024bd00a 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c @@ -2341,8 +2341,7 @@ static int hclgevf_init_msi(struct hclgevf_dev *hdev) PCI_IRQ_MSIX); else vectors = pci_alloc_irq_vectors(pdev, HNAE3_MIN_VECTOR_NUM, - hdev->num_msi, - PCI_IRQ_MSI | PCI_IRQ_MSIX); + hdev->num_msi, PCI_IRQ_MSI_TYPES); if (vectors < 0) { dev_err(&pdev->dev, -- 2.17.2