mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-06 08:46:46 +00:00
[PATCH] SH: C99 initializers for hw_interrupt_type structures
Convert the initializers of hw_interrupt_type structures to C99 initializers. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
2830e21eb3
commit
08d0fd07c3
13 changed files with 105 additions and 105 deletions
|
@ -37,13 +37,13 @@ static void end_maskreg_irq(unsigned int irq);
|
||||||
|
|
||||||
/* hw_interrupt_type */
|
/* hw_interrupt_type */
|
||||||
static struct hw_interrupt_type maskreg_irq_type = {
|
static struct hw_interrupt_type maskreg_irq_type = {
|
||||||
" Mask Register",
|
.typename = " Mask Register",
|
||||||
startup_maskreg_irq,
|
.startup = startup_maskreg_irq,
|
||||||
shutdown_maskreg_irq,
|
.shutdown = shutdown_maskreg_irq,
|
||||||
enable_maskreg_irq,
|
.enable = enable_maskreg_irq,
|
||||||
disable_maskreg_irq,
|
.disable = disable_maskreg_irq,
|
||||||
mask_and_ack_maskreg,
|
.ack = mask_and_ack_maskreg,
|
||||||
end_maskreg_irq
|
.end = end_maskreg_irq
|
||||||
};
|
};
|
||||||
|
|
||||||
/* actual implementatin */
|
/* actual implementatin */
|
||||||
|
|
|
@ -228,23 +228,23 @@ static void shutdown_bigsur_irq(unsigned int irq)
|
||||||
|
|
||||||
/* Define the IRQ structures for the L1 and L2 IRQ types */
|
/* Define the IRQ structures for the L1 and L2 IRQ types */
|
||||||
static struct hw_interrupt_type bigsur_l1irq_type = {
|
static struct hw_interrupt_type bigsur_l1irq_type = {
|
||||||
"BigSur-CPLD-Level1-IRQ",
|
.typename = "BigSur-CPLD-Level1-IRQ",
|
||||||
startup_bigsur_irq,
|
.startup = startup_bigsur_irq,
|
||||||
shutdown_bigsur_irq,
|
.shutdown = shutdown_bigsur_irq,
|
||||||
enable_bigsur_l1irq,
|
.enable = enable_bigsur_l1irq,
|
||||||
disable_bigsur_l1irq,
|
.disable = disable_bigsur_l1irq,
|
||||||
mask_and_ack_bigsur,
|
.ack = mask_and_ack_bigsur,
|
||||||
end_bigsur_irq
|
.end = end_bigsur_irq
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct hw_interrupt_type bigsur_l2irq_type = {
|
static struct hw_interrupt_type bigsur_l2irq_type = {
|
||||||
"BigSur-CPLD-Level2-IRQ",
|
.typename = "BigSur-CPLD-Level2-IRQ",
|
||||||
startup_bigsur_irq,
|
.startup = startup_bigsur_irq,
|
||||||
shutdown_bigsur_irq,
|
.shutdown =shutdown_bigsur_irq,
|
||||||
enable_bigsur_l2irq,
|
.enable = enable_bigsur_l2irq,
|
||||||
disable_bigsur_l2irq,
|
.disable = disable_bigsur_l2irq,
|
||||||
mask_and_ack_bigsur,
|
.ack = mask_and_ack_bigsur,
|
||||||
end_bigsur_irq
|
.end = end_bigsur_irq
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -83,13 +83,13 @@ static void shutdown_cqreek_irq(unsigned int irq)
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct hw_interrupt_type cqreek_irq_type = {
|
static struct hw_interrupt_type cqreek_irq_type = {
|
||||||
"CqREEK-IRQ",
|
.typename = "CqREEK-IRQ",
|
||||||
startup_cqreek_irq,
|
.startup = startup_cqreek_irq,
|
||||||
shutdown_cqreek_irq,
|
.shutdown = shutdown_cqreek_irq,
|
||||||
enable_cqreek_irq,
|
.enable = enable_cqreek_irq,
|
||||||
disable_cqreek_irq,
|
.disable = disable_cqreek_irq,
|
||||||
mask_and_ack_cqreek,
|
.ack = mask_and_ack_cqreek,
|
||||||
end_cqreek_irq
|
.end = end_cqreek_irq
|
||||||
};
|
};
|
||||||
|
|
||||||
int cqreek_has_ide, cqreek_has_isa;
|
int cqreek_has_ide, cqreek_has_isa;
|
||||||
|
|
|
@ -39,13 +39,13 @@ static unsigned int startup_harp_irq(unsigned int irq)
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct hw_interrupt_type harp_irq_type = {
|
static struct hw_interrupt_type harp_irq_type = {
|
||||||
"Harp-IRQ",
|
.typename = "Harp-IRQ",
|
||||||
startup_harp_irq,
|
.startup = startup_harp_irq,
|
||||||
shutdown_harp_irq,
|
.shutdown = shutdown_harp_irq,
|
||||||
enable_harp_irq,
|
.enable = enable_harp_irq,
|
||||||
disable_harp_irq,
|
.disable = disable_harp_irq,
|
||||||
mask_and_ack_harp,
|
.ack = mask_and_ack_harp,
|
||||||
end_harp_irq
|
.end = end_harp_irq
|
||||||
};
|
};
|
||||||
|
|
||||||
static void disable_harp_irq(unsigned int irq)
|
static void disable_harp_irq(unsigned int irq)
|
||||||
|
|
|
@ -86,13 +86,13 @@ static unsigned int startup_od_irq(unsigned int irq)
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct hw_interrupt_type od_irq_type = {
|
static struct hw_interrupt_type od_irq_type = {
|
||||||
"Overdrive-IRQ",
|
.typename = "Overdrive-IRQ",
|
||||||
startup_od_irq,
|
.startup = startup_od_irq,
|
||||||
shutdown_od_irq,
|
.shutdown = shutdown_od_irq,
|
||||||
enable_od_irq,
|
.enable = enable_od_irq,
|
||||||
disable_od_irq,
|
.disable = disable_od_irq,
|
||||||
mask_and_ack_od,
|
.ack = mask_and_ack_od,
|
||||||
end_od_irq
|
.end = end_od_irq
|
||||||
};
|
};
|
||||||
|
|
||||||
static void disable_od_irq(unsigned int irq)
|
static void disable_od_irq(unsigned int irq)
|
||||||
|
|
|
@ -74,13 +74,13 @@ static void end_hs7751rvoip_irq(unsigned int irq)
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct hw_interrupt_type hs7751rvoip_irq_type = {
|
static struct hw_interrupt_type hs7751rvoip_irq_type = {
|
||||||
"HS7751RVoIP IRQ",
|
.typename = "HS7751RVoIP IRQ",
|
||||||
startup_hs7751rvoip_irq,
|
.startup = startup_hs7751rvoip_irq,
|
||||||
shutdown_hs7751rvoip_irq,
|
.shutdown = shutdown_hs7751rvoip_irq,
|
||||||
enable_hs7751rvoip_irq,
|
.enable = enable_hs7751rvoip_irq,
|
||||||
disable_hs7751rvoip_irq,
|
.disable = disable_hs7751rvoip_irq,
|
||||||
ack_hs7751rvoip_irq,
|
.ack = ack_hs7751rvoip_irq,
|
||||||
end_hs7751rvoip_irq,
|
.end = end_hs7751rvoip_irq,
|
||||||
};
|
};
|
||||||
|
|
||||||
static void make_hs7751rvoip_irq(unsigned int irq)
|
static void make_hs7751rvoip_irq(unsigned int irq)
|
||||||
|
|
|
@ -88,13 +88,13 @@ static void end_rts7751r2d_irq(unsigned int irq)
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct hw_interrupt_type rts7751r2d_irq_type = {
|
static struct hw_interrupt_type rts7751r2d_irq_type = {
|
||||||
"RTS7751R2D IRQ",
|
.typename = "RTS7751R2D IRQ",
|
||||||
startup_rts7751r2d_irq,
|
.startup = startup_rts7751r2d_irq,
|
||||||
shutdown_rts7751r2d_irq,
|
.shutdown = shutdown_rts7751r2d_irq,
|
||||||
enable_rts7751r2d_irq,
|
.enable = enable_rts7751r2d_irq,
|
||||||
disable_rts7751r2d_irq,
|
.disable = disable_rts7751r2d_irq,
|
||||||
ack_rts7751r2d_irq,
|
.ack = ack_rts7751r2d_irq,
|
||||||
end_rts7751r2d_irq,
|
.end = end_rts7751r2d_irq,
|
||||||
};
|
};
|
||||||
|
|
||||||
static void make_rts7751r2d_irq(unsigned int irq)
|
static void make_rts7751r2d_irq(unsigned int irq)
|
||||||
|
|
|
@ -35,13 +35,13 @@ static void end_systemh_irq(unsigned int irq);
|
||||||
|
|
||||||
/* hw_interrupt_type */
|
/* hw_interrupt_type */
|
||||||
static struct hw_interrupt_type systemh_irq_type = {
|
static struct hw_interrupt_type systemh_irq_type = {
|
||||||
" SystemH Register",
|
.typename = " SystemH Register",
|
||||||
startup_systemh_irq,
|
.startup = startup_systemh_irq,
|
||||||
shutdown_systemh_irq,
|
.shutdown = shutdown_systemh_irq,
|
||||||
enable_systemh_irq,
|
.enable = enable_systemh_irq,
|
||||||
disable_systemh_irq,
|
.disable = disable_systemh_irq,
|
||||||
mask_and_ack_systemh,
|
.ack = mask_and_ack_systemh,
|
||||||
end_systemh_irq
|
.end = end_systemh_irq
|
||||||
};
|
};
|
||||||
|
|
||||||
static unsigned int startup_systemh_irq(unsigned int irq)
|
static unsigned int startup_systemh_irq(unsigned int irq)
|
||||||
|
|
|
@ -83,13 +83,13 @@ static unsigned int startup_microdev_irq(unsigned int irq)
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct hw_interrupt_type microdev_irq_type = {
|
static struct hw_interrupt_type microdev_irq_type = {
|
||||||
"MicroDev-IRQ",
|
.typename = "MicroDev-IRQ",
|
||||||
startup_microdev_irq,
|
.startup = startup_microdev_irq,
|
||||||
shutdown_microdev_irq,
|
.shutdown = shutdown_microdev_irq,
|
||||||
enable_microdev_irq,
|
.enable = enable_microdev_irq,
|
||||||
disable_microdev_irq,
|
.disable = disable_microdev_irq,
|
||||||
mask_and_ack_microdev,
|
.ack = mask_and_ack_microdev,
|
||||||
end_microdev_irq
|
.end = end_microdev_irq
|
||||||
};
|
};
|
||||||
|
|
||||||
static void disable_microdev_irq(unsigned int irq)
|
static void disable_microdev_irq(unsigned int irq)
|
||||||
|
|
|
@ -87,13 +87,13 @@ static void shutdown_voyagergx_irq(unsigned int irq)
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct hw_interrupt_type voyagergx_irq_type = {
|
static struct hw_interrupt_type voyagergx_irq_type = {
|
||||||
"VOYAGERGX-IRQ",
|
.typename = "VOYAGERGX-IRQ",
|
||||||
startup_voyagergx_irq,
|
.startup = startup_voyagergx_irq,
|
||||||
shutdown_voyagergx_irq,
|
.shutdown = shutdown_voyagergx_irq,
|
||||||
enable_voyagergx_irq,
|
.enable = enable_voyagergx_irq,
|
||||||
disable_voyagergx_irq,
|
.disable = disable_voyagergx_irq,
|
||||||
mask_and_ack_voyagergx,
|
.ack = mask_and_ack_voyagergx,
|
||||||
end_voyagergx_irq,
|
.end = end_voyagergx_irq,
|
||||||
};
|
};
|
||||||
|
|
||||||
static irqreturn_t voyagergx_interrupt(int irq, void *dev_id, struct pt_regs *regs)
|
static irqreturn_t voyagergx_interrupt(int irq, void *dev_id, struct pt_regs *regs)
|
||||||
|
|
|
@ -46,13 +46,13 @@ static unsigned int startup_imask_irq(unsigned int irq)
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct hw_interrupt_type imask_irq_type = {
|
static struct hw_interrupt_type imask_irq_type = {
|
||||||
"SR.IMASK",
|
.typename = "SR.IMASK",
|
||||||
startup_imask_irq,
|
.startup = startup_imask_irq,
|
||||||
shutdown_imask_irq,
|
.shutdown = shutdown_imask_irq,
|
||||||
enable_imask_irq,
|
.enable = enable_imask_irq,
|
||||||
disable_imask_irq,
|
.disable = disable_imask_irq,
|
||||||
mask_and_ack_imask,
|
.ack = mask_and_ack_imask,
|
||||||
end_imask_irq
|
.end = end_imask_irq
|
||||||
};
|
};
|
||||||
|
|
||||||
void static inline set_interrupt_registers(int ip)
|
void static inline set_interrupt_registers(int ip)
|
||||||
|
|
|
@ -48,13 +48,13 @@ static unsigned int startup_ipr_irq(unsigned int irq)
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct hw_interrupt_type ipr_irq_type = {
|
static struct hw_interrupt_type ipr_irq_type = {
|
||||||
"IPR-IRQ",
|
.typename = "IPR-IRQ",
|
||||||
startup_ipr_irq,
|
.startup = startup_ipr_irq,
|
||||||
shutdown_ipr_irq,
|
.shutdown = shutdown_ipr_irq,
|
||||||
enable_ipr_irq,
|
.enable = enable_ipr_irq,
|
||||||
disable_ipr_irq,
|
.disable = disable_ipr_irq,
|
||||||
mask_and_ack_ipr,
|
.ack = mask_and_ack_ipr,
|
||||||
end_ipr_irq
|
.end = end_ipr_irq
|
||||||
};
|
};
|
||||||
|
|
||||||
static void disable_ipr_irq(unsigned int irq)
|
static void disable_ipr_irq(unsigned int irq)
|
||||||
|
@ -142,13 +142,13 @@ static unsigned int startup_pint_irq(unsigned int irq)
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct hw_interrupt_type pint_irq_type = {
|
static struct hw_interrupt_type pint_irq_type = {
|
||||||
"PINT-IRQ",
|
.typename = "PINT-IRQ",
|
||||||
startup_pint_irq,
|
.startup = startup_pint_irq,
|
||||||
shutdown_pint_irq,
|
.shutdown = shutdown_pint_irq,
|
||||||
enable_pint_irq,
|
.enable = enable_pint_irq,
|
||||||
disable_pint_irq,
|
.disable = disable_pint_irq,
|
||||||
mask_and_ack_pint,
|
.ack = mask_and_ack_pint,
|
||||||
end_pint_irq
|
.end = end_pint_irq
|
||||||
};
|
};
|
||||||
|
|
||||||
static void disable_pint_irq(unsigned int irq)
|
static void disable_pint_irq(unsigned int irq)
|
||||||
|
|
|
@ -48,13 +48,13 @@ static unsigned int startup_intc2_irq(unsigned int irq)
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct hw_interrupt_type intc2_irq_type = {
|
static struct hw_interrupt_type intc2_irq_type = {
|
||||||
"INTC2-IRQ",
|
.typename = "INTC2-IRQ",
|
||||||
startup_intc2_irq,
|
.startup = startup_intc2_irq,
|
||||||
shutdown_intc2_irq,
|
.shutdown = shutdown_intc2_irq,
|
||||||
enable_intc2_irq,
|
.enable = enable_intc2_irq,
|
||||||
disable_intc2_irq,
|
.disable = disable_intc2_irq,
|
||||||
mask_and_ack_intc2,
|
.ack = mask_and_ack_intc2,
|
||||||
end_intc2_irq
|
.end = end_intc2_irq
|
||||||
};
|
};
|
||||||
|
|
||||||
static void disable_intc2_irq(unsigned int irq)
|
static void disable_intc2_irq(unsigned int irq)
|
||||||
|
|
Loading…
Reference in a new issue