aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2010-10-11 06:21:18 -0400
committerThomas Gleixner <tglx@linutronix.de>2010-10-12 10:53:43 -0400
commit10ba1e0eeef6a3c9453d96364e28cb4d911e1ac3 (patch)
treec535feadce8d57e5e96f401e156617c7e9ab4237
parent1a0730d6649113c820217387a011a17dd4aff3ad (diff)
genirq: Remove irq_2_iommu
irq_2_iommu is now in the x86 code where it belongs. Remove all leftovers. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Ingo Molnar <mingo@elte.hu> Acked-by: Suresh Siddha <suresh.b.siddha@intel.com> Cc: David Woodhouse <dwmw2@infradead.org> Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
-rw-r--r--include/linux/irq.h18
-rw-r--r--include/linux/irqdesc.h4
2 files changed, 0 insertions, 22 deletions
diff --git a/include/linux/irq.h b/include/linux/irq.h
index ef878823ee3b..49702b22883e 100644
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -85,7 +85,6 @@ typedef void (*irq_flow_handler_t)(unsigned int irq,
85#endif 85#endif
86 86
87struct msi_desc; 87struct msi_desc;
88struct irq_2_iommu;
89 88
90/** 89/**
91 * struct irq_data - per irq and irq chip data passed down to chip functions 90 * struct irq_data - per irq and irq chip data passed down to chip functions
@@ -97,7 +96,6 @@ struct irq_2_iommu;
97 * methods, to allow shared chip implementations 96 * methods, to allow shared chip implementations
98 * @msi_desc: MSI descriptor 97 * @msi_desc: MSI descriptor
99 * @affinity: IRQ affinity on SMP 98 * @affinity: IRQ affinity on SMP
100 * @irq_2_iommu: iommu with this irq
101 * 99 *
102 * The fields here need to overlay the ones in irq_desc until we 100 * The fields here need to overlay the ones in irq_desc until we
103 * cleaned up the direct references and switched everything over to 101 * cleaned up the direct references and switched everything over to
@@ -113,9 +111,6 @@ struct irq_data {
113#ifdef CONFIG_SMP 111#ifdef CONFIG_SMP
114 cpumask_var_t affinity; 112 cpumask_var_t affinity;
115#endif 113#endif
116#ifdef CONFIG_INTR_REMAP
117 struct irq_2_iommu *irq_2_iommu;
118#endif
119}; 114};
120 115
121/** 116/**
@@ -389,19 +384,6 @@ static inline struct msi_desc *irq_data_get_msi(struct irq_data *d)
389 return d->msi_desc; 384 return d->msi_desc;
390} 385}
391 386
392#ifdef CONFIG_INTR_REMAP
393static inline struct irq_2_iommu *get_irq_iommu(unsigned int irq)
394{
395 struct irq_data *d = irq_get_irq_data(irq);
396 return d ? d->irq_2_iommu : NULL;
397}
398
399static inline struct irq_2_iommu *irq_data_get_iommu(struct irq_data *d)
400{
401 return d->irq_2_iommu;
402}
403#endif
404
405int irq_alloc_descs(int irq, unsigned int from, unsigned int cnt, int node); 387int irq_alloc_descs(int irq, unsigned int from, unsigned int cnt, int node);
406void irq_free_descs(unsigned int irq, unsigned int cnt); 388void irq_free_descs(unsigned int irq, unsigned int cnt);
407int irq_reserve_irqs(unsigned int from, unsigned int cnt); 389int irq_reserve_irqs(unsigned int from, unsigned int cnt);
diff --git a/include/linux/irqdesc.h b/include/linux/irqdesc.h
index 22e426fdd301..f77dc5618d7e 100644
--- a/include/linux/irqdesc.h
+++ b/include/linux/irqdesc.h
@@ -10,7 +10,6 @@
10 10
11struct proc_dir_entry; 11struct proc_dir_entry;
12struct timer_rand_state; 12struct timer_rand_state;
13struct irq_2_iommu;
14/** 13/**
15 * struct irq_desc - interrupt descriptor 14 * struct irq_desc - interrupt descriptor
16 * @irq_data: per irq and chip data passed down to chip functions 15 * @irq_data: per irq and chip data passed down to chip functions
@@ -53,9 +52,6 @@ struct irq_desc {
53#ifdef CONFIG_SMP 52#ifdef CONFIG_SMP
54 cpumask_var_t affinity; 53 cpumask_var_t affinity;
55#endif 54#endif
56#ifdef CONFIG_INTR_REMAP
57 struct irq_2_iommu *irq_2_iommu;
58#endif
59 }; 55 };
60 }; 56 };
61#endif 57#endif