提交 86bc3dfe 编写于 作者: T Thomas Gleixner 提交者: Tony Luck

[IA64] remove obsolete irq_desc_t typedef

The defines and typedefs (hw_interrupt_type, no_irq_type, irq_desc_t) have
been kept around for migration reasons.  After more than two years it's
time to remove them finally.

This patch cleans up one of the remaining users.  When all such patches
hit mainline we can remove the defines and typedefs finally.

Impact: cleanup

Convert the last remaining users and remove the typedef.
Signed-off-by: NThomas Gleixner <tglx@linutronix.de>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NTony Luck <tony.luck@intel.com>
上级 8a7c3cd3
...@@ -41,7 +41,7 @@ static struct hw_interrupt_type irq_type_hp_sim = { ...@@ -41,7 +41,7 @@ static struct hw_interrupt_type irq_type_hp_sim = {
void __init void __init
hpsim_irq_init (void) hpsim_irq_init (void)
{ {
irq_desc_t *idesc; struct irq_desc *idesc;
int i; int i;
for (i = 0; i < NR_IRQS; ++i) { for (i = 0; i < NR_IRQS; ++i) {
......
...@@ -146,7 +146,7 @@ static inline void ia64_native_resend_irq(unsigned int vector) ...@@ -146,7 +146,7 @@ static inline void ia64_native_resend_irq(unsigned int vector)
* Default implementations for the irq-descriptor API: * Default implementations for the irq-descriptor API:
*/ */
extern irq_desc_t irq_desc[NR_IRQS]; extern struct irq_desc irq_desc[NR_IRQS];
#ifndef CONFIG_IA64_GENERIC #ifndef CONFIG_IA64_GENERIC
static inline ia64_vector __ia64_irq_to_vector(int irq) static inline ia64_vector __ia64_irq_to_vector(int irq)
......
...@@ -451,7 +451,7 @@ iosapic_startup_edge_irq (unsigned int irq) ...@@ -451,7 +451,7 @@ iosapic_startup_edge_irq (unsigned int irq)
static void static void
iosapic_ack_edge_irq (unsigned int irq) iosapic_ack_edge_irq (unsigned int irq)
{ {
irq_desc_t *idesc = irq_desc + irq; struct irq_desc *idesc = irq_desc + irq;
irq_complete_move(irq); irq_complete_move(irq);
move_native_irq(irq); move_native_irq(irq);
...@@ -600,7 +600,7 @@ static int ...@@ -600,7 +600,7 @@ static int
register_intr (unsigned int gsi, int irq, unsigned char delivery, register_intr (unsigned int gsi, int irq, unsigned char delivery,
unsigned long polarity, unsigned long trigger) unsigned long polarity, unsigned long trigger)
{ {
irq_desc_t *idesc; struct irq_desc *idesc;
struct hw_interrupt_type *irq_type; struct hw_interrupt_type *irq_type;
int index; int index;
struct iosapic_rte_info *rte; struct iosapic_rte_info *rte;
...@@ -828,7 +828,7 @@ iosapic_unregister_intr (unsigned int gsi) ...@@ -828,7 +828,7 @@ iosapic_unregister_intr (unsigned int gsi)
{ {
unsigned long flags; unsigned long flags;
int irq, index; int irq, index;
irq_desc_t *idesc; struct irq_desc *idesc;
u32 low32; u32 low32;
unsigned long trigger, polarity; unsigned long trigger, polarity;
unsigned int dest; unsigned int dest;
......
...@@ -130,7 +130,7 @@ unsigned int vectors_in_migration[NR_IRQS]; ...@@ -130,7 +130,7 @@ unsigned int vectors_in_migration[NR_IRQS];
*/ */
static void migrate_irqs(void) static void migrate_irqs(void)
{ {
irq_desc_t *desc; struct irq_desc *desc;
int irq, new_cpu; int irq, new_cpu;
for (irq=0; irq < NR_IRQS; irq++) { for (irq=0; irq < NR_IRQS; irq++) {
......
...@@ -630,7 +630,7 @@ static struct irqaction tlb_irqaction = { ...@@ -630,7 +630,7 @@ static struct irqaction tlb_irqaction = {
void void
ia64_native_register_percpu_irq (ia64_vector vec, struct irqaction *action) ia64_native_register_percpu_irq (ia64_vector vec, struct irqaction *action)
{ {
irq_desc_t *desc; struct irq_desc *desc;
unsigned int irq; unsigned int irq;
irq = vec; irq = vec;
......
...@@ -2093,7 +2093,7 @@ ia64_mca_late_init(void) ...@@ -2093,7 +2093,7 @@ ia64_mca_late_init(void)
cpe_poll_timer.function = ia64_mca_cpe_poll; cpe_poll_timer.function = ia64_mca_cpe_poll;
{ {
irq_desc_t *desc; struct irq_desc *desc;
unsigned int irq; unsigned int irq;
if (cpe_vector >= 0) { if (cpe_vector >= 0) {
......
...@@ -678,7 +678,7 @@ extern void fixup_irqs(void); ...@@ -678,7 +678,7 @@ extern void fixup_irqs(void);
int migrate_platform_irqs(unsigned int cpu) int migrate_platform_irqs(unsigned int cpu)
{ {
int new_cpei_cpu; int new_cpei_cpu;
irq_desc_t *desc = NULL; struct irq_desc *desc = NULL;
const struct cpumask *mask; const struct cpumask *mask;
int retval = 0; int retval = 0;
......
...@@ -295,7 +295,7 @@ unsigned int sn_local_vector_to_irq(u8 vector) ...@@ -295,7 +295,7 @@ unsigned int sn_local_vector_to_irq(u8 vector)
void sn_irq_init(void) void sn_irq_init(void)
{ {
int i; int i;
irq_desc_t *base_desc = irq_desc; struct irq_desc *base_desc = irq_desc;
ia64_first_device_vector = IA64_SN2_FIRST_DEVICE_VECTOR; ia64_first_device_vector = IA64_SN2_FIRST_DEVICE_VECTOR;
ia64_last_device_vector = IA64_SN2_LAST_DEVICE_VECTOR; ia64_last_device_vector = IA64_SN2_LAST_DEVICE_VECTOR;
...@@ -377,7 +377,7 @@ void sn_irq_fixup(struct pci_dev *pci_dev, struct sn_irq_info *sn_irq_info) ...@@ -377,7 +377,7 @@ void sn_irq_fixup(struct pci_dev *pci_dev, struct sn_irq_info *sn_irq_info)
int cpu = nasid_slice_to_cpuid(nasid, slice); int cpu = nasid_slice_to_cpuid(nasid, slice);
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
int cpuphys; int cpuphys;
irq_desc_t *desc; struct irq_desc *desc;
#endif #endif
pci_dev_get(pci_dev); pci_dev_get(pci_dev);
......
...@@ -138,7 +138,7 @@ static void ...@@ -138,7 +138,7 @@ static void
__xen_register_percpu_irq(unsigned int cpu, unsigned int vec, __xen_register_percpu_irq(unsigned int cpu, unsigned int vec,
struct irqaction *action, int save) struct irqaction *action, int save)
{ {
irq_desc_t *desc; struct irq_desc *desc;
int irq = 0; int irq = 0;
if (xen_slab_ready) { if (xen_slab_ready) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册