lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

MSI: Consolidate precondition checks

Browse Source 
Consolidate precondition checks into a single if statement.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Acked-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Michael Ellerman
2007-03-22 21:51:39 +11:00
committed by Greg Kroah-Hartman
parent b1e2303dba
commit 128bc5fced
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/pci/msi.c
View File

@@ -525,12 +525,7 @@ void pci_disable_msi(struct pci_dev* dev)
struct msi_desc *entry; struct msi_desc *entry;
int default_irq; int default_irq;
if (!pci_msi_enable) if (!pci_msi_enable || !dev || !dev->msi_enabled)
return;
if (!dev)
return;
if (!dev->msi_enabled)
return; return;
msi_set_enable(dev, 0); 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) void pci_disable_msix(struct pci_dev* dev)
{ {
if (!pci_msi_enable) if (!pci_msi_enable || !dev || !dev->msix_enabled)
return;
if (!dev)
return;
if (!dev->msix_enabled)
return; return;
msix_set_enable(dev, 0); msix_set_enable(dev, 0);