From 0c24412fe6f9b581ae9c70032b33d7bf77da5417 Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Mon, 5 Jan 2009 14:50:27 +0100 Subject: [PATCH] --- yaml --- r: 127411 b: refs/heads/master c: 16cf0ebc35dd63f72628ba1246132a6fd17bced2 h: refs/heads/master i: 127409: 40d7b2b2a8bb621f949bda1d7d9c5c1a92417bc4 127407: 106d1f62415fc072e07de24b2600bfd2c25692bb v: v3 --- [refs] | 2 +- trunk/arch/x86/pci/common.c | 4 ++-- trunk/include/linux/pci.h | 9 +++++++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index fdc7d73be823..1d232b77477c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ef1bba28bfe68ef3c0488feeaabd3e8bc523130c +refs/heads/master: 16cf0ebc35dd63f72628ba1246132a6fd17bced2 diff --git a/trunk/arch/x86/pci/common.c b/trunk/arch/x86/pci/common.c index 9ab8509f7b15..82d22fc601ae 100644 --- a/trunk/arch/x86/pci/common.c +++ b/trunk/arch/x86/pci/common.c @@ -551,14 +551,14 @@ int pcibios_enable_device(struct pci_dev *dev, int mask) if ((err = pci_enable_resources(dev, mask)) < 0) return err; - if (!dev->msi_enabled) + if (!pci_dev_msi_enabled(dev)) return pcibios_enable_irq(dev); return 0; } void pcibios_disable_device (struct pci_dev *dev) { - if (!dev->msi_enabled && pcibios_disable_irq) + if (!pci_dev_msi_enabled(dev) && pcibios_disable_irq) pcibios_disable_irq(dev); } diff --git a/trunk/include/linux/pci.h b/trunk/include/linux/pci.h index 0f6d2bb1df9c..80f8b8b65fde 100644 --- a/trunk/include/linux/pci.h +++ b/trunk/include/linux/pci.h @@ -336,6 +336,15 @@ struct pci_bus { #define pci_bus_b(n) list_entry(n, struct pci_bus, node) #define to_pci_bus(n) container_of(n, struct pci_bus, dev) +#ifdef CONFIG_PCI_MSI +static inline bool pci_dev_msi_enabled(struct pci_dev *pci_dev) +{ + return pci_dev->msi_enabled || pci_dev->msix_enabled; +} +#else +static inline bool pci_dev_msi_enabled(struct pci_dev *pci_dev) { return false; } +#endif + /* * Error values that may be returned by PCI functions. */