diff options
author | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2011-06-09 09:49:13 -0400 |
---|---|---|
committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2011-07-11 13:19:30 -0400 |
commit | a0ee05670915006564962114d4211dd578a8b28a (patch) | |
tree | d2c2d6599f32af66c9606fb67f31824956f6c0f9 /arch/x86/include/asm | |
parent | ed89eb6396b3307bf9aaa4785f6a0914a68040cf (diff) |
xen/pci: Squash pci_xen_initial_domain and xen_setup_pirqs together.
Since they are only called once and the rest of the pci_xen_*
functions follow the same pattern of setup.
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'arch/x86/include/asm')
-rw-r--r-- | arch/x86/include/asm/xen/pci.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/include/asm/xen/pci.h b/arch/x86/include/asm/xen/pci.h index 4fbda9a3f339..968d57dd54c9 100644 --- a/arch/x86/include/asm/xen/pci.h +++ b/arch/x86/include/asm/xen/pci.h | |||
@@ -14,13 +14,14 @@ static inline int pci_xen_hvm_init(void) | |||
14 | } | 14 | } |
15 | #endif | 15 | #endif |
16 | #if defined(CONFIG_XEN_DOM0) | 16 | #if defined(CONFIG_XEN_DOM0) |
17 | void __init xen_setup_pirqs(void); | 17 | int __init pci_xen_initial_domain(void); |
18 | int xen_find_device_domain_owner(struct pci_dev *dev); | 18 | int xen_find_device_domain_owner(struct pci_dev *dev); |
19 | int xen_register_device_domain_owner(struct pci_dev *dev, uint16_t domain); | 19 | int xen_register_device_domain_owner(struct pci_dev *dev, uint16_t domain); |
20 | int xen_unregister_device_domain_owner(struct pci_dev *dev); | 20 | int xen_unregister_device_domain_owner(struct pci_dev *dev); |
21 | #else | 21 | #else |
22 | static inline void __init xen_setup_pirqs(void) | 22 | static inline int __init pci_xen_initial_domain(void) |
23 | { | 23 | { |
24 | return -1; | ||
24 | } | 25 | } |
25 | static inline int xen_find_device_domain_owner(struct pci_dev *dev) | 26 | static inline int xen_find_device_domain_owner(struct pci_dev *dev) |
26 | { | 27 | { |