[rt2x00-users] [PATCH 11/12] rt2x00: Remove interrupt thread registration

[Gertjan van Wingerde]

On 01/14/11 10:41, Helmut Schaa wrote:
> No driver uses interrupt threads anymore. Remove the remaining interrupt
> thread artifacts.
> 
> Signed-off-by: Helmut Schaa <helmut.schaa at googlemail.com>

Acked-by: Gertjan van Wingerde <gwingerde at gmail.com>

> ---
>  drivers/net/wireless/rt2x00/rt2x00.h    |   11 -----------
>  drivers/net/wireless/rt2x00/rt2x00pci.c |    7 +++----
>  2 files changed, 3 insertions(+), 15 deletions(-)
> 
> diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
> index 2375722..922cc6c 100644
> --- a/drivers/net/wireless/rt2x00/rt2x00.h
> +++ b/drivers/net/wireless/rt2x00/rt2x00.h
> @@ -512,11 +512,6 @@ struct rt2x00lib_ops {
>  	irq_handler_t irq_handler;
>  
>  	/*
> -	 * Threaded Interrupt handlers.
> -	 */
> -	irq_handler_t irq_handler_thread;
> -
> -	/*
>  	 * TX status tasklet handler.
>  	 */
>  	void (*txstatus_tasklet) (unsigned long data);
> @@ -896,12 +891,6 @@ struct rt2x00_dev {
>  	const struct firmware *fw;
>  
>  	/*
> -	 * Interrupt values, stored between interrupt service routine
> -	 * and interrupt thread routine.
> -	 */
> -	u32 irqvalue[2];
> -
> -	/*
>  	 * FIFO for storing tx status reports between isr and tasklet.
>  	 */
>  	DECLARE_KFIFO_PTR(txstatus_fifo, u32);
> diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.c b/drivers/net/wireless/rt2x00/rt2x00pci.c
> index 73631c6..c0ad77a 100644
> --- a/drivers/net/wireless/rt2x00/rt2x00pci.c
> +++ b/drivers/net/wireless/rt2x00/rt2x00pci.c
> @@ -160,10 +160,9 @@ int rt2x00pci_initialize(struct rt2x00_dev *rt2x00dev)
>  	/*
>  	 * Register interrupt handler.
>  	 */
> -	status = request_threaded_irq(rt2x00dev->irq,
> -				      rt2x00dev->ops->lib->irq_handler,
> -				      rt2x00dev->ops->lib->irq_handler_thread,
> -				      IRQF_SHARED, rt2x00dev->name, rt2x00dev);
> +	status = request_irq(rt2x00dev->irq,
> +			     rt2x00dev->ops->lib->irq_handler,
> +			     IRQF_SHARED, rt2x00dev->name, rt2x00dev);
>  	if (status) {
>  		ERROR(rt2x00dev, "IRQ %d allocation failed (error %d).\n",
>  		      rt2x00dev->irq, status);