Commit 08d0fd07 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Linus Torvalds
Browse files

[PATCH] SH: C99 initializers for hw_interrupt_type structures 



Convert the initializers of hw_interrupt_type structures to C99 initializers.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 2830e21e

arch/sh/boards/adx/irq_maskreg.c

+7 −7
Original line number Diff line number Diff line
@@ -37,13 +37,13 @@ static void end_maskreg_irq(unsigned int irq); 


/* hw_interrupt_type */

static struct hw_interrupt_type maskreg_irq_type = {

	" Mask Register",

	startup_maskreg_irq,

	shutdown_maskreg_irq,

	enable_maskreg_irq,

	disable_maskreg_irq,

	mask_and_ack_maskreg,

	end_maskreg_irq

	.typename = " Mask Register",

	.startup = startup_maskreg_irq,

	.shutdown = shutdown_maskreg_irq,

	.enable = enable_maskreg_irq,

	.disable = disable_maskreg_irq,

	.ack = mask_and_ack_maskreg,

	.end = end_maskreg_irq

};



/* actual implementatin */

arch/sh/boards/bigsur/irq.c

+14 −14
Original line number Diff line number Diff line
@@ -228,23 +228,23 @@ static void shutdown_bigsur_irq(unsigned int irq) 


/* Define the IRQ structures for the L1 and L2 IRQ types */

static struct hw_interrupt_type bigsur_l1irq_type = {

        "BigSur-CPLD-Level1-IRQ",

        startup_bigsur_irq,

        shutdown_bigsur_irq,

        enable_bigsur_l1irq,

        disable_bigsur_l1irq,

        mask_and_ack_bigsur,

        end_bigsur_irq

	.typename  = "BigSur-CPLD-Level1-IRQ",

	.startup = startup_bigsur_irq,

	.shutdown = shutdown_bigsur_irq,

	.enable = enable_bigsur_l1irq,

	.disable = disable_bigsur_l1irq,

	.ack = mask_and_ack_bigsur,

	.end = end_bigsur_irq

};



static struct hw_interrupt_type bigsur_l2irq_type = {

        "BigSur-CPLD-Level2-IRQ",

        startup_bigsur_irq,

        shutdown_bigsur_irq,

        enable_bigsur_l2irq,

        disable_bigsur_l2irq,

        mask_and_ack_bigsur,

        end_bigsur_irq

	.typename  = "BigSur-CPLD-Level2-IRQ",

	.startup = startup_bigsur_irq,

	.shutdown  =shutdown_bigsur_irq,

	.enable = enable_bigsur_l2irq,

	.disable = disable_bigsur_l2irq,

	.ack = mask_and_ack_bigsur,

	.end = end_bigsur_irq

};

arch/sh/boards/cqreek/irq.c

+7 −7
Original line number Diff line number Diff line
@@ -83,13 +83,13 @@ static void shutdown_cqreek_irq(unsigned int irq) 
}



static struct hw_interrupt_type cqreek_irq_type = {

	"CqREEK-IRQ",

	startup_cqreek_irq,

	shutdown_cqreek_irq,

	enable_cqreek_irq,

	disable_cqreek_irq,

	mask_and_ack_cqreek,

	end_cqreek_irq

	.typename = "CqREEK-IRQ",

	.startup = startup_cqreek_irq,

	.shutdown = shutdown_cqreek_irq,

	.enable = enable_cqreek_irq,

	.disable = disable_cqreek_irq,

	.ack = mask_and_ack_cqreek,

	.end = end_cqreek_irq

};



int cqreek_has_ide, cqreek_has_isa;

arch/sh/boards/harp/irq.c

+7 −7
Original line number Diff line number Diff line
@@ -39,13 +39,13 @@ static unsigned int startup_harp_irq(unsigned int irq) 
}



static struct hw_interrupt_type harp_irq_type = {

	"Harp-IRQ",

	startup_harp_irq,

	shutdown_harp_irq,

	enable_harp_irq,

	disable_harp_irq,

	mask_and_ack_harp,

	end_harp_irq

	.typename = "Harp-IRQ",

	.startup = startup_harp_irq,

	.shutdown = shutdown_harp_irq,

	.enable = enable_harp_irq,

	.disable = disable_harp_irq,

	.ack = mask_and_ack_harp,

	.end = end_harp_irq

};



static void disable_harp_irq(unsigned int irq)

arch/sh/boards/overdrive/irq.c

+7 −7
Original line number Diff line number Diff line
@@ -86,13 +86,13 @@ static unsigned int startup_od_irq(unsigned int irq) 
}



static struct hw_interrupt_type od_irq_type = {

	"Overdrive-IRQ",

	startup_od_irq,

	shutdown_od_irq,

	enable_od_irq,

	disable_od_irq,

	mask_and_ack_od,

	end_od_irq

	.typename = "Overdrive-IRQ",

	.startup = startup_od_irq,

	.shutdown = shutdown_od_irq,

	.enable = enable_od_irq,

	.disable = disable_od_irq,

	.ack = mask_and_ack_od,

	.end = end_od_irq

};



static void disable_od_irq(unsigned int irq)