Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ab00b9a authored by Ralf Baechle's avatar Ralf Baechle
Browse files

Convert struct hw_interrupt_type initializations to ISO C99 named


initializers.

Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent d437441e
Loading
Loading
Loading
Loading
+28 −32
Original line number Diff line number Diff line
@@ -253,47 +253,43 @@ void restore_local_and_enable(int controller, unsigned long mask)


static struct hw_interrupt_type rise_edge_irq_type = {
	"Au1000 Rise Edge",
	startup_irq,
	shutdown_irq,
	local_enable_irq,
	local_disable_irq,
	mask_and_ack_rise_edge_irq,
	end_irq,
	NULL
	.typename = "Au1000 Rise Edge",
	.startup = startup_irq,
	.shutdown = shutdown_irq,
	.enable = local_enable_irq,
	.disable = local_disable_irq,
	.ack = mask_and_ack_rise_edge_irq,
	.end = end_irq,
};

static struct hw_interrupt_type fall_edge_irq_type = {
	"Au1000 Fall Edge",
	startup_irq,
	shutdown_irq,
	local_enable_irq,
	local_disable_irq,
	mask_and_ack_fall_edge_irq,
	end_irq,
	NULL
	.typename = "Au1000 Fall Edge",
	.startup = startup_irq,
	.shutdown = shutdown_irq,
	.enable = local_enable_irq,
	.disable = local_disable_irq,
	.ack = mask_and_ack_fall_edge_irq,
	.end = end_irq,
};

static struct hw_interrupt_type either_edge_irq_type = {
	"Au1000 Rise or Fall Edge",
	startup_irq,
	shutdown_irq,
	local_enable_irq,
	local_disable_irq,
	mask_and_ack_either_edge_irq,
	end_irq,
	NULL
	.typename = "Au1000 Rise or Fall Edge",
	.startup = startup_irq,
	.shutdown = shutdown_irq,
	.enable = local_enable_irq,
	.disable = local_disable_irq,
	.ack = mask_and_ack_either_edge_irq,
	.end = end_irq,
};

static struct hw_interrupt_type level_irq_type = {
	"Au1000 Level",
	startup_irq,
	shutdown_irq,
	local_enable_irq,
	local_disable_irq,
	mask_and_ack_level_irq,
	end_irq,
	NULL
	.typename = "Au1000 Level",
	.startup = startup_irq,
	.shutdown = shutdown_irq,
	.enable = local_enable_irq,
	.disable = local_disable_irq,
	.ack = mask_and_ack_level_irq,
	.end = end_irq,
};

#ifdef CONFIG_PM
+7 −8
Original line number Diff line number Diff line
@@ -209,14 +209,13 @@ static void nile4_irq_end(unsigned int irq) {
#define nile4_irq_shutdown nile4_disable_irq

static hw_irq_controller nile4_irq_controller = {
    "nile4",
    nile4_irq_startup,
    nile4_irq_shutdown,
    nile4_enable_irq,
    nile4_disable_irq,
    nile4_ack_irq,
    nile4_irq_end,
    NULL
	.typename = "nile4",
	.startup = nile4_irq_startup,
	.shutdown = nile4_irq_shutdown,
	.enable = nile4_enable_irq,
	.disable = nile4_disable_irq,
	.ack = nile4_ack_irq,
	.end = nile4_irq_end,
};

void nile4_irq_setup(u32 base) {
+7 −8
Original line number Diff line number Diff line
@@ -53,14 +53,13 @@ static void vrc5476_irq_end(uint irq)
}

static hw_irq_controller vrc5476_irq_controller = {
	"vrc5476",
	vrc5476_irq_startup,
	vrc5476_irq_shutdown,
	vrc5476_irq_enable,
	vrc5476_irq_disable,
	vrc5476_irq_ack,
	vrc5476_irq_end,
	NULL				/* no affinity stuff for UP */
	.typename = "vrc5476",
	.startup = vrc5476_irq_startup,
	.shutdown = vrc5476_irq_shutdown,
	.enable = vrc5476_irq_enable,
	.disable = vrc5476_irq_disable,
	.ack = vrc5476_irq_ack,
	.end = vrc5476_irq_end
};

void __init
+7 −8
Original line number Diff line number Diff line
@@ -90,14 +90,13 @@ vrc5477_irq_end(unsigned int irq)
}

hw_irq_controller vrc5477_irq_controller = {
	"vrc5477_irq",
	vrc5477_irq_startup,
	vrc5477_irq_shutdown,
	vrc5477_irq_enable,
	vrc5477_irq_disable,
	vrc5477_irq_ack,
	vrc5477_irq_end,
	NULL			/* no affinity stuff for UP */
	.typename = "vrc5477_irq",
	.startup = vrc5477_irq_startup,
	.shutdown = vrc5477_irq_shutdown,
	.enable = vrc5477_irq_enable,
	.disable = vrc5477_irq_disable,
	.ack = vrc5477_irq_ack,
	.end = vrc5477_irq_end
};

void __init vrc5477_irq_init(u32 irq_base)
+14 −15
Original line number Diff line number Diff line
@@ -138,14 +138,13 @@ static void end_ite_irq(unsigned int irq)
}

static struct hw_interrupt_type it8172_irq_type = {
	"ITE8172",
	startup_ite_irq,
	shutdown_ite_irq,
	enable_it8172_irq,
	disable_it8172_irq,
	mask_and_ack_ite_irq,
	end_ite_irq,
	NULL
	.typename = "ITE8172",
	.startup = startup_ite_irq,
	.shutdown = shutdown_ite_irq,
	.enable = enable_it8172_irq,
	.disable = disable_it8172_irq,
	.ack = mask_and_ack_ite_irq,
	.end = end_ite_irq,
};


@@ -159,13 +158,13 @@ static void ack_none(unsigned int irq) { }
#define end_none	enable_none

static struct hw_interrupt_type cp0_irq_type = {
	"CP0 Count",
	startup_none,
	shutdown_none,
	enable_none,
	disable_none,
	ack_none,
	end_none
	.typename = "CP0 Count",
	.startup = startup_none,
	.shutdown = shutdown_none,
	.enable = enable_none,
	.disable = disable_none,
	.ack = ack_none,
	.end = end_none
};

void enable_cpu_timer(void)
Loading