[PATCH v2 3/7] um: clean up alarm IRQ chip name

Anton Ivanov anton.ivanov at cambridgegreys.com
Wed Dec 2 09:13:57 EST 2020



On 02/12/2020 11:59, Johannes Berg wrote:
> From: Johannes Berg <johannes.berg at intel.com>
> 
> 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 <anton.ivanov at cambridgegreys.com>
> Signed-off-by: Johannes Berg <johannes.berg at 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 at cambridgegreys.com>

-- 
Anton R. Ivanov
Cambridgegreys Limited. Registered in England. Company Number 10273661
https://www.cambridgegreys.com/



More information about the linux-um mailing list