Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3f45647 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Greg Kroah-Hartman
Browse files

genwqe: use pci_irq_allocate_vectors 



Simply the interrupt setup by using the new PCI layer helpers.

One odd thing about this driver is that it looks like it could request
multiple MSI vectors, but it will then only ever use a single one.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarGabriel Krisman Bertazi <krisman@linux.vnet.ibm.com>
Acked-by: default avatarFrank Haverkamp <haver@linux.vnet.ibm.com&gt;=>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d4608a83

drivers/misc/genwqe/card_base.h

+0 −1
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ 
#include "genwqe_driver.h"



#define GENWQE_MSI_IRQS			4  /* Just one supported, no MSIx */

#define GENWQE_FLAG_MSI_ENABLED		(1 << 0)



#define GENWQE_MAX_VFS			15 /* maximum 15 VFs are possible */

#define GENWQE_MAX_FUNCS		16 /* 1 PF and 15 VFs */

drivers/misc/genwqe/card_utils.c

+2 −10
Original line number Diff line number Diff line
@@ -740,13 +740,10 @@ int genwqe_read_softreset(struct genwqe_dev *cd) 
int genwqe_set_interrupt_capability(struct genwqe_dev *cd, int count)

{

	int rc;

	struct pci_dev *pci_dev = cd->pci_dev;



	rc = pci_enable_msi_range(pci_dev, 1, count);

	rc = pci_alloc_irq_vectors(cd->pci_dev, 1, count, PCI_IRQ_MSI);

	if (rc < 0)

		return rc;



	cd->flags |= GENWQE_FLAG_MSI_ENABLED;

	return 0;

}
@@ -756,12 +753,7 @@ int genwqe_set_interrupt_capability(struct genwqe_dev *cd, int count) 
 */

void genwqe_reset_interrupt_capability(struct genwqe_dev *cd)

{

	struct pci_dev *pci_dev = cd->pci_dev;



	if (cd->flags & GENWQE_FLAG_MSI_ENABLED) {

		pci_disable_msi(pci_dev);

		cd->flags &= ~GENWQE_FLAG_MSI_ENABLED;

	}

	pci_free_irq_vectors(cd->pci_dev);

}



/**