Re: [PATCH] [TRIVIAL] Changes to IRQs.

Re: [PATCH] [TRIVIAL] Changes to IRQs.

[Jiri Kosina]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 2568 bytes --]

On Sun, 20 Sep 2009, Krzysztof Halasa wrote:

> Trivial changes to IRQs.
> 
> Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>
> 
> diff --git a/Documentation/DocBook/genericirq.tmpl b/Documentation/DocBook/genericirq.tmpl
> index c671a01..1448b33 100644
> --- a/Documentation/DocBook/genericirq.tmpl
> +++ b/Documentation/DocBook/genericirq.tmpl
> @@ -417,8 +417,8 @@ desc->chip->end();
>        </para>
>        <para>
>  	To make use of the split implementation, replace the call to
> -	__do_IRQ by a call to desc->chip->handle_irq() and associate
> -        the appropriate handler function to desc->chip->handle_irq().
> +	__do_IRQ by a call to desc->handle_irq() and associate
> +        the appropriate handler function to desc->handle_irq().
>  	In most cases the generic handler implementations should
>  	be sufficient.
>       </para>
> diff --git a/arch/arm/include/asm/hw_irq.h b/arch/arm/include/asm/hw_irq.h
> index 90831f6..5b4e642 100644
> --- a/arch/arm/include/asm/hw_irq.h
> +++ b/arch/arm/include/asm/hw_irq.h
> @@ -10,14 +10,6 @@ static inline void ack_bad_irq(int irq)
>  	irq_err_count++;
>  }
>  
> -/*
> - * Obsolete inline function for calling irq descriptor handlers.
> - */
> -static inline void desc_handle_irq(unsigned int irq, struct irq_desc *desc)
> -{
> -	desc->handle_irq(irq, desc);
> -}
> -
>  void set_irq_flags(unsigned int irq, unsigned int flags);
>  
>  #define IRQF_VALID	(1 << 0)
> diff --git a/arch/arm/plat-orion/gpio.c b/arch/arm/plat-orion/gpio.c
> index e814803..85f305a 100644
> --- a/arch/arm/plat-orion/gpio.c
> +++ b/arch/arm/plat-orion/gpio.c
> @@ -354,6 +354,6 @@ void orion_gpio_irq_handler(int pinoff)
>  			polarity ^= 1 << (pin & 31);
>  			writel(polarity, GPIO_IN_POL(pin));
>  		}
> -		desc_handle_irq(irq, desc);
> +		desc->handle_irq(irq, desc);
>  	}
>  }
> diff --git a/include/linux/irq.h b/include/linux/irq.h
> index cb2e77a..b0424fe 100644
> --- a/include/linux/irq.h
> +++ b/include/linux/irq.h
> @@ -281,7 +281,7 @@ extern irqreturn_t handle_IRQ_event(unsigned int irq, struct irqaction *action);
>  
>  /*
>   * Built-in IRQ handlers for various IRQ types,
> - * callable via desc->chip->handle_irq()
> + * callable via desc->handle_irq()
>   */
>  extern void handle_level_irq(unsigned int irq, struct irq_desc *desc);
>  extern void handle_fasteoi_irq(unsigned int irq, struct irq_desc *desc);
> 

This doesn't really qualify for trivial queue, adding ARM addressess to CC 
(I hope I got them right after the latest flame :P) at least for the ARM 
bits.

-- 
Jiri Kosina
SUSE Labs, Novell Inc.

Re: [PATCH] [TRIVIAL] Changes to IRQs.

[Jiri Kosina]

On Sun, 20 Sep 2009, Jiri Kosina wrote:

> This doesn't really qualify for trivial queue, adding ARM addressess to CC 
> (I hope I got them right after the latest flame :P)

Hmm, apparently I did not.


	<linux-arm-kernel@lists.arm.linux.org.uk>: host
	    lists.arm.linux.org.uk[78.32.30.220] said: 550 Please direct your 
	    message to the new mailing lists on lists.infradead.org (in reply to 
	    RCPT TO command)


Could someone please update MAINTAINERS to reflect reality? I am 
apparently not smart enough to keep track of the current situation with 
the ARM mailinglists. I thought that final decision was 
linux-arm@vger.kernel.org. MAINTAINERS lists 
linux-arm-kernel@lists.arm.linux.org.uk, but the bounce suggests to use 
lists.infradead.org ... 

-- 
Jiri Kosina
SUSE Labs, Novell Inc.

Re: [PATCH] [TRIVIAL] Changes to IRQs.

[Krzysztof Halasa]

Jiri Kosina <jkosina@suse.cz> writes:

> This doesn't really qualify for trivial queue, adding ARM addressess to CC
> (I hope I got them right after the latest flame :P) at least for the ARM
> bits.

(Fixed the arm ml address, and lkml too (my mistake)).

But you noticed, of course, that the only real change is that to the
arch/arm/plat-orion/gpio.c? Just asking to make sure as the patch may
look longer than it is.

>> +++ b/Documentation/DocBook/genericirq.tmpl
>> @@ -417,8 +417,8 @@ desc->chip->end();
>>        </para>
>>        <para>
>>  	To make use of the split implementation, replace the call to
>> -	__do_IRQ by a call to desc->chip->handle_irq() and associate
>> -        the appropriate handler function to desc->chip->handle_irq().
>> +	__do_IRQ by a call to desc->handle_irq() and associate
>> +        the appropriate handler function to desc->handle_irq().

Only the comment fix, the code has been changed long ago.

>> +++ b/arch/arm/include/asm/hw_irq.h
>> @@ -10,14 +10,6 @@ static inline void ack_bad_irq(int irq)
>>  	irq_err_count++;
>>  }
>>  
>> -/*
>> - * Obsolete inline function for calling irq descriptor handlers.
>> - */
>> -static inline void desc_handle_irq(unsigned int irq, struct irq_desc *desc)
>> -{
>> -	desc->handle_irq(irq, desc);
>> -}

IIRC there had been no users of this function for some time, one has
been added recently...

>> +++ b/arch/arm/plat-orion/gpio.c
>> @@ -354,6 +354,6 @@ void orion_gpio_irq_handler(int pinoff)
>>  			polarity ^= 1 << (pin & 31);
>>  			writel(polarity, GPIO_IN_POL(pin));
>>  		}
>> -		desc_handle_irq(irq, desc);
>> +		desc->handle_irq(irq, desc);
>>  	}
>>  }

That's the one. I've little doubt someone did that by mistake.

>> +++ b/include/linux/irq.h
>> @@ -281,7 +281,7 @@ extern irqreturn_t handle_IRQ_event(unsigned int irq, struct irqaction *action);
>>  
>>  /*
>>   * Built-in IRQ handlers for various IRQ types,
>> - * callable via desc->chip->handle_irq()
>> + * callable via desc->handle_irq()

The code has been changed long ago, the patch only fixes comments.

But of course I'm not insisting, just wanted to flush my queue of such
things out.
-- 
Krzysztof Halasa

[PATCH] [TRIVIAL] Changes to IRQs.

[Krzysztof Halasa]

[Copy sent to trivial@kernel.org]

Trivial changes to IRQs.

Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>

diff --git a/Documentation/DocBook/genericirq.tmpl b/Documentation/DocBook/genericirq.tmpl
index c671a01..1448b33 100644
--- a/Documentation/DocBook/genericirq.tmpl
+++ b/Documentation/DocBook/genericirq.tmpl
@@ -417,8 +417,8 @@ desc->chip->end();
       </para>
       <para>
 	To make use of the split implementation, replace the call to
-	__do_IRQ by a call to desc->chip->handle_irq() and associate
-        the appropriate handler function to desc->chip->handle_irq().
+	__do_IRQ by a call to desc->handle_irq() and associate
+        the appropriate handler function to desc->handle_irq().
 	In most cases the generic handler implementations should
 	be sufficient.
      </para>
diff --git a/arch/arm/include/asm/hw_irq.h b/arch/arm/include/asm/hw_irq.h
index 90831f6..5b4e642 100644
--- a/arch/arm/include/asm/hw_irq.h
+++ b/arch/arm/include/asm/hw_irq.h
@@ -10,14 +10,6 @@ static inline void ack_bad_irq(int irq)
 	irq_err_count++;
 }
 
-/*
- * Obsolete inline function for calling irq descriptor handlers.
- */
-static inline void desc_handle_irq(unsigned int irq, struct irq_desc *desc)
-{
-	desc->handle_irq(irq, desc);
-}
-
 void set_irq_flags(unsigned int irq, unsigned int flags);
 
 #define IRQF_VALID	(1 << 0)
diff --git a/arch/arm/plat-orion/gpio.c b/arch/arm/plat-orion/gpio.c
index e814803..85f305a 100644
--- a/arch/arm/plat-orion/gpio.c
+++ b/arch/arm/plat-orion/gpio.c
@@ -354,6 +354,6 @@ void orion_gpio_irq_handler(int pinoff)
 			polarity ^= 1 << (pin & 31);
 			writel(polarity, GPIO_IN_POL(pin));
 		}
-		desc_handle_irq(irq, desc);
+		desc->handle_irq(irq, desc);
 	}
 }
diff --git a/include/linux/irq.h b/include/linux/irq.h
index cb2e77a..b0424fe 100644
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -281,7 +281,7 @@ extern irqreturn_t handle_IRQ_event(unsigned int irq, struct irqaction *action);
 
 /*
  * Built-in IRQ handlers for various IRQ types,
- * callable via desc->chip->handle_irq()
+ * callable via desc->handle_irq()
  */
 extern void handle_level_irq(unsigned int irq, struct irq_desc *desc);
 extern void handle_fasteoi_irq(unsigned int irq, struct irq_desc *desc);