parisc: remove obsolete hw_interrupt_type
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 to struct irq_chip and remove the define. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
This commit is contained in:
parent
47b4150baa
commit
dfe0756502
7 changed files with 8 additions and 8 deletions
|
@ -144,7 +144,7 @@ static int cpu_set_affinity_irq(unsigned int irq, const struct cpumask *dest)
|
|||
}
|
||||
#endif
|
||||
|
||||
static struct hw_interrupt_type cpu_interrupt_type = {
|
||||
static struct irq_chip cpu_interrupt_type = {
|
||||
.typename = "CPU",
|
||||
.startup = cpu_startup_irq,
|
||||
.shutdown = cpu_disable_irq,
|
||||
|
|
|
@ -353,7 +353,7 @@ static unsigned int dino_startup_irq(unsigned int irq)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static struct hw_interrupt_type dino_interrupt_type = {
|
||||
static struct irq_chip dino_interrupt_type = {
|
||||
.typename = "GSC-PCI",
|
||||
.startup = dino_startup_irq,
|
||||
.shutdown = dino_disable_irq,
|
||||
|
|
|
@ -188,7 +188,7 @@ static unsigned int eisa_startup_irq(unsigned int irq)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static struct hw_interrupt_type eisa_interrupt_type = {
|
||||
static struct irq_chip eisa_interrupt_type = {
|
||||
.typename = "EISA",
|
||||
.startup = eisa_startup_irq,
|
||||
.shutdown = eisa_disable_irq,
|
||||
|
|
|
@ -148,7 +148,7 @@ static unsigned int gsc_asic_startup_irq(unsigned int irq)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static struct hw_interrupt_type gsc_asic_interrupt_type = {
|
||||
static struct irq_chip gsc_asic_interrupt_type = {
|
||||
.typename = "GSC-ASIC",
|
||||
.startup = gsc_asic_startup_irq,
|
||||
.shutdown = gsc_asic_disable_irq,
|
||||
|
@ -158,7 +158,7 @@ static struct hw_interrupt_type gsc_asic_interrupt_type = {
|
|||
.end = no_end_irq,
|
||||
};
|
||||
|
||||
int gsc_assign_irq(struct hw_interrupt_type *type, void *data)
|
||||
int gsc_assign_irq(struct irq_chip *type, void *data)
|
||||
{
|
||||
static int irq = GSC_IRQ_BASE;
|
||||
struct irq_desc *desc;
|
||||
|
|
|
@ -38,7 +38,7 @@ struct gsc_asic {
|
|||
int gsc_common_setup(struct parisc_device *parent, struct gsc_asic *gsc_asic);
|
||||
int gsc_alloc_irq(struct gsc_irq *dev); /* dev needs an irq */
|
||||
int gsc_claim_irq(struct gsc_irq *dev, int irq); /* dev needs this irq */
|
||||
int gsc_assign_irq(struct hw_interrupt_type *type, void *data);
|
||||
int gsc_assign_irq(struct irq_chip *type, void *data);
|
||||
int gsc_find_local_irq(unsigned int irq, int *global_irq, int limit);
|
||||
void gsc_fixup_irqs(struct parisc_device *parent, void *ctrl,
|
||||
void (*choose)(struct parisc_device *child, void *ctrl));
|
||||
|
|
|
@ -729,7 +729,7 @@ static int iosapic_set_affinity_irq(unsigned int irq,
|
|||
}
|
||||
#endif
|
||||
|
||||
static struct hw_interrupt_type iosapic_interrupt_type = {
|
||||
static struct irq_chip iosapic_interrupt_type = {
|
||||
.typename = "IO-SAPIC-level",
|
||||
.startup = iosapic_startup_irq,
|
||||
.shutdown = iosapic_disable_irq,
|
||||
|
|
|
@ -325,7 +325,7 @@ static unsigned int superio_startup_irq(unsigned int irq)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static struct hw_interrupt_type superio_interrupt_type = {
|
||||
static struct irq_chip superio_interrupt_type = {
|
||||
.typename = SUPERIO,
|
||||
.startup = superio_startup_irq,
|
||||
.shutdown = superio_disable_irq,
|
||||
|
|
Loading…
Reference in a new issue