Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=128bc5fced238752d01b5169077f2ec624b3d59b Commit: 128bc5fced238752d01b5169077f2ec624b3d59b Parent: b1e2303dba021ee417c65a89e467a2b145ff9217 Author: Michael Ellerman <[EMAIL PROTECTED]> AuthorDate: Thu Mar 22 21:51:39 2007 +1100 Committer: Greg Kroah-Hartman <[EMAIL PROTECTED]> CommitDate: Wed May 2 19:02:36 2007 -0700
MSI: Consolidate precondition checks Consolidate precondition checks into a single if statement. Signed-off-by: Michael Ellerman <[EMAIL PROTECTED]> Acked-by: Eric W. Biederman <[EMAIL PROTECTED]> Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]> --- drivers/pci/msi.c | 14 ++------------ 1 files changed, 2 insertions(+), 12 deletions(-) diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index d5b9b94..b6dc69e 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -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); - To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html