| Message ID | 20201123205446.d4ce9995bfe5.I782d052498e91373788c1650029d3571a26e4bdf@changeid |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | [1/7] um: support dynamic IRQ allocation | expand |
On 23/11/2020 19:56, Johannes Berg wrote: > From: Johannes Berg <johannes.berg@intel.com> > > We don't use "SIGVTALRM", it's just SIGALRM. Clean up the naming. > While at it, fix the comment's grammar. > > Signed-off-by: Johannes Berg <johannes.berg@intel.com> > --- > 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); > Acked-By: Anton Ivanov <anton.ivanov@cambridgegreys.com>
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);