From 0ede3c05eec875d05a397d16808857492d206dcf Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Wed, 2 Dec 2020 12:59:52 +0100 Subject: [PATCH] um: Clean up alarm IRQ chip name We don't use "SIGVTALRM", it's just SIGALRM. Clean up the naming. While at it, fix the comment's grammar. Acked-By: Anton Ivanov Signed-off-by: Johannes Berg Acked-By: Anton Ivanov Signed-off-by: Richard Weinberger --- arch/um/kernel/irq.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c index b94c72f56617..97ff77c297c8 100644 --- a/arch/um/kernel/irq.c +++ b/arch/um/kernel/irq.c @@ -481,7 +481,7 @@ static void dummy(struct irq_data *d) { } -/* This is used for everything else than the timer. */ +/* This is used for everything other than the timer. */ static struct irq_chip normal_irq_type = { .name = "SIGIO", .irq_disable = dummy, @@ -491,8 +491,8 @@ static struct irq_chip normal_irq_type = { .irq_unmask = dummy, }; -static struct irq_chip SIGVTALRM_irq_type = { - .name = "SIGVTALRM", +static struct irq_chip alarm_irq_type = { + .name = "SIGALRM", .irq_disable = dummy, .irq_enable = dummy, .irq_ack = dummy, @@ -504,8 +504,7 @@ void __init init_IRQ(void) { int i; - irq_set_chip_and_handler(TIMER_IRQ, &SIGVTALRM_irq_type, handle_edge_irq); - + irq_set_chip_and_handler(TIMER_IRQ, &alarm_irq_type, handle_edge_irq); for (i = 1; i < NR_IRQS; i++) irq_set_chip_and_handler(i, &normal_irq_type, handle_edge_irq);