[PATCH 14/15] net: hns3: use PCI_IRQ_MSI_TYPES where appropriate

[PATCH 14/15] net: hns3: use PCI_IRQ_MSI_TYPES where appropriate

[Piotr Stankiewicz]

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 <piotr.stankiewicz@intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@intel.com>
---
 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c   | 3 +--
 drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 2 +-
 2 files changed, 2 insertions(+), 3 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..002a40e65ab7 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
@@ -2342,7 +2342,7 @@ static int hclgevf_init_msi(struct hclgevf_dev *hdev)
 	else
 		vectors = pci_alloc_irq_vectors(pdev, HNAE3_MIN_VECTOR_NUM,
 						hdev->num_msi,
-						PCI_IRQ_MSI | PCI_IRQ_MSIX);
+						PCI_IRQ_MSI_TYPES);
 
 	if (vectors < 0) {
 		dev_err(&pdev->dev,
-- 
2.17.2

Re: [PATCH 14/15] net: hns3: use PCI_IRQ_MSI_TYPES where appropriate

[Andy Shevchenko]

On Tue, Jun 2, 2020 at 12:26 PM Piotr Stankiewicz
<piotr.stankiewicz@intel.com> wrote:
>
> Seeing as there is shorthand available to use when asking for any type
> of interrupt, or any type of message signalled interrupt, leverage it.

...

>         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);

...

>                 vectors = pci_alloc_irq_vectors(pdev, HNAE3_MIN_VECTOR_NUM,

>                                                 hdev->num_msi,
> -                                               PCI_IRQ_MSI | PCI_IRQ_MSIX);
> +                                               PCI_IRQ_MSI_TYPES);

One line as above?

-- 
With Best Regards,
Andy Shevchenko

RE: [PATCH 14/15] net: hns3: use PCI_IRQ_MSI_TYPES where appropriate

[Stankiewicz, Piotr]

> -----Original Message-----
> From: Andy Shevchenko <andy.shevchenko@gmail.com>
> Sent: Tuesday, June 2, 2020 5:39 PM
> 
> On Tue, Jun 2, 2020 at 12:26 PM Piotr Stankiewicz
> <piotr.stankiewicz@intel.com> wrote:
> >
> > Seeing as there is shorthand available to use when asking for any type
> > of interrupt, or any type of message signalled interrupt, leverage it.
> 
> ...
> 
> >         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);
> 
> ...
> 
> >                 vectors = pci_alloc_irq_vectors(pdev, HNAE3_MIN_VECTOR_NUM,
> 
> >                                                 hdev->num_msi,
> > -                                               PCI_IRQ_MSI | PCI_IRQ_MSIX);
> > +                                               PCI_IRQ_MSI_TYPES);
> 
> One line as above?
> 

It would push the line above 80 characters. 

> --
> With Best Regards,
> Andy Shevchenko

BR,
Piotr

Re: [PATCH 14/15] net: hns3: use PCI_IRQ_MSI_TYPES where appropriate

[Andy Shevchenko]

On Wed, Jun 3, 2020 at 11:50 AM Stankiewicz, Piotr
<piotr.stankiewicz@intel.com> wrote:
> > -----Original Message-----
> > From: Andy Shevchenko <andy.shevchenko@gmail.com>
> > Sent: Tuesday, June 2, 2020 5:39 PM
> > On Tue, Jun 2, 2020 at 12:26 PM Piotr Stankiewicz
> > <piotr.stankiewicz@intel.com> wrote:

...

> > >                                                 hdev->num_msi,
> > > -                                               PCI_IRQ_MSI | PCI_IRQ_MSIX);
> > > +                                               PCI_IRQ_MSI_TYPES);
> >
> > One line as above?
> >
>
> It would push the line above 80 characters.

It's now relaxed limit, but if it is only few characters, I wouldn't care.

-- 
With Best Regards,
Andy Shevchenko