Commit 128bc5fc authored by Michael Ellerman's avatar Michael Ellerman Committed by Greg Kroah-Hartman
Browse files

MSI: Consolidate precondition checks 



Consolidate precondition checks into a single if statement.

Signed-off-by: default avatarMichael Ellerman <michael@ellerman.id.au>
Acked-by: default avatarEric W. Biederman <ebiederm@xmission.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b1e2303d

drivers/pci/msi.c

+2 −12
Original line number Diff line number Diff line
@@ -525,12 +525,7 @@ void pci_disable_msi(struct pci_dev* dev) 
	struct msi_desc *entry;

	int default_irq;



	if (!pci_msi_enable)

		return;

	if (!dev)

		return;



	if (!dev->msi_enabled)

	if (!pci_msi_enable || !dev || !dev->msi_enabled)

		return;



	msi_set_enable(dev, 0);
@@ -656,12 +651,7 @@ static void msix_free_all_irqs(struct pci_dev *dev) 


void pci_disable_msix(struct pci_dev* dev)

{

	if (!pci_msi_enable)

		return;

	if (!dev)

		return;



	if (!dev->msix_enabled)

	if (!pci_msi_enable || !dev || !dev->msix_enabled)

		return;



	msix_set_enable(dev, 0);