[rt2x00-users] [PATCH 12/12] rt2x00: Remove STATE_RADIO_IRQ_OFF_ISR and STATE_RADIO_IRQ_ON_ISR

[Gertjan van Wingerde]

On 01/14/11 10:41, Helmut Schaa wrote:
> Remove STATE_RADIO_IRQ_OFF_ISR and STATE_RADIO_IRQ_ON_ISR as they are
> not used anymore.
> 
> Signed-off-by: Helmut Schaa <helmut.schaa at googlemail.com>

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

> ---
>  drivers/net/wireless/rt2x00/rt2400pci.c |    5 +----
>  drivers/net/wireless/rt2x00/rt2500pci.c |    5 +----
>  drivers/net/wireless/rt2x00/rt2500usb.c |    2 --
>  drivers/net/wireless/rt2x00/rt2800pci.c |    5 +----
>  drivers/net/wireless/rt2x00/rt2800usb.c |    2 --
>  drivers/net/wireless/rt2x00/rt2x00reg.h |    2 --
>  drivers/net/wireless/rt2x00/rt61pci.c   |    5 +----
>  drivers/net/wireless/rt2x00/rt73usb.c   |    2 --
>  8 files changed, 4 insertions(+), 24 deletions(-)
> 
> diff --git a/drivers/net/wireless/rt2x00/rt2400pci.c b/drivers/net/wireless/rt2x00/rt2400pci.c
> index b324917..5c88fdc 100644
> --- a/drivers/net/wireless/rt2x00/rt2400pci.c
> +++ b/drivers/net/wireless/rt2x00/rt2400pci.c
> @@ -971,8 +971,7 @@ static int rt2400pci_init_bbp(struct rt2x00_dev *rt2x00dev)
>  static void rt2400pci_toggle_irq(struct rt2x00_dev *rt2x00dev,
>  				 enum dev_state state)
>  {
> -	int mask = (state == STATE_RADIO_IRQ_OFF) ||
> -		   (state == STATE_RADIO_IRQ_OFF_ISR);
> +	int mask = (state == STATE_RADIO_IRQ_OFF);
>  	u32 reg;
>  	unsigned long flags;
>  
> @@ -1087,9 +1086,7 @@ static int rt2400pci_set_device_state(struct rt2x00_dev *rt2x00dev,
>  		rt2400pci_disable_radio(rt2x00dev);
>  		break;
>  	case STATE_RADIO_IRQ_ON:
> -	case STATE_RADIO_IRQ_ON_ISR:
>  	case STATE_RADIO_IRQ_OFF:
> -	case STATE_RADIO_IRQ_OFF_ISR:
>  		rt2400pci_toggle_irq(rt2x00dev, state);
>  		break;
>  	case STATE_DEEP_SLEEP:
> diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c
> index 7daa483..3ef1fb4 100644
> --- a/drivers/net/wireless/rt2x00/rt2500pci.c
> +++ b/drivers/net/wireless/rt2x00/rt2500pci.c
> @@ -1126,8 +1126,7 @@ static int rt2500pci_init_bbp(struct rt2x00_dev *rt2x00dev)
>  static void rt2500pci_toggle_irq(struct rt2x00_dev *rt2x00dev,
>  				 enum dev_state state)
>  {
> -	int mask = (state == STATE_RADIO_IRQ_OFF) ||
> -		   (state == STATE_RADIO_IRQ_OFF_ISR);
> +	int mask = (state == STATE_RADIO_IRQ_OFF);
>  	u32 reg;
>  	unsigned long flags;
>  
> @@ -1241,9 +1240,7 @@ static int rt2500pci_set_device_state(struct rt2x00_dev *rt2x00dev,
>  		rt2500pci_disable_radio(rt2x00dev);
>  		break;
>  	case STATE_RADIO_IRQ_ON:
> -	case STATE_RADIO_IRQ_ON_ISR:
>  	case STATE_RADIO_IRQ_OFF:
> -	case STATE_RADIO_IRQ_OFF_ISR:
>  		rt2500pci_toggle_irq(rt2x00dev, state);
>  		break;
>  	case STATE_DEEP_SLEEP:
> diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c
> index 157516e..01f385d 100644
> --- a/drivers/net/wireless/rt2x00/rt2500usb.c
> +++ b/drivers/net/wireless/rt2x00/rt2500usb.c
> @@ -1054,9 +1054,7 @@ static int rt2500usb_set_device_state(struct rt2x00_dev *rt2x00dev,
>  		rt2500usb_disable_radio(rt2x00dev);
>  		break;
>  	case STATE_RADIO_IRQ_ON:
> -	case STATE_RADIO_IRQ_ON_ISR:
>  	case STATE_RADIO_IRQ_OFF:
> -	case STATE_RADIO_IRQ_OFF_ISR:
>  		/* No support, but no error either */
>  		break;
>  	case STATE_DEEP_SLEEP:
> diff --git a/drivers/net/wireless/rt2x00/rt2800pci.c b/drivers/net/wireless/rt2x00/rt2800pci.c
> index 3eaa4fd..1da5cc2 100644
> --- a/drivers/net/wireless/rt2x00/rt2800pci.c
> +++ b/drivers/net/wireless/rt2x00/rt2800pci.c
> @@ -418,8 +418,7 @@ static int rt2800pci_init_queues(struct rt2x00_dev *rt2x00dev)
>  static void rt2800pci_toggle_irq(struct rt2x00_dev *rt2x00dev,
>  				 enum dev_state state)
>  {
> -	int mask = (state == STATE_RADIO_IRQ_ON) ||
> -		   (state == STATE_RADIO_IRQ_ON_ISR);
> +	int mask = (state == STATE_RADIO_IRQ_ON);
>  	u32 reg;
>  	unsigned long flags;
>  
> @@ -564,9 +563,7 @@ static int rt2800pci_set_device_state(struct rt2x00_dev *rt2x00dev,
>  		rt2800pci_set_state(rt2x00dev, STATE_SLEEP);
>  		break;
>  	case STATE_RADIO_IRQ_ON:
> -	case STATE_RADIO_IRQ_ON_ISR:
>  	case STATE_RADIO_IRQ_OFF:
> -	case STATE_RADIO_IRQ_OFF_ISR:
>  		rt2800pci_toggle_irq(rt2x00dev, state);
>  		break;
>  	case STATE_DEEP_SLEEP:
> diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
> index fe34da9..8375146 100644
> --- a/drivers/net/wireless/rt2x00/rt2800usb.c
> +++ b/drivers/net/wireless/rt2x00/rt2800usb.c
> @@ -282,9 +282,7 @@ static int rt2800usb_set_device_state(struct rt2x00_dev *rt2x00dev,
>  		rt2800usb_set_state(rt2x00dev, STATE_SLEEP);
>  		break;
>  	case STATE_RADIO_IRQ_ON:
> -	case STATE_RADIO_IRQ_ON_ISR:
>  	case STATE_RADIO_IRQ_OFF:
> -	case STATE_RADIO_IRQ_OFF_ISR:
>  		/* No support, but no error either */
>  		break;
>  	case STATE_DEEP_SLEEP:
> diff --git a/drivers/net/wireless/rt2x00/rt2x00reg.h b/drivers/net/wireless/rt2x00/rt2x00reg.h
> index e8259ae..6f867ee 100644
> --- a/drivers/net/wireless/rt2x00/rt2x00reg.h
> +++ b/drivers/net/wireless/rt2x00/rt2x00reg.h
> @@ -85,8 +85,6 @@ enum dev_state {
>  	STATE_RADIO_OFF,
>  	STATE_RADIO_IRQ_ON,
>  	STATE_RADIO_IRQ_OFF,
> -	STATE_RADIO_IRQ_ON_ISR,
> -	STATE_RADIO_IRQ_OFF_ISR,
>  };
>  
>  /*
> diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
> index 351055d..3afafab 100644
> --- a/drivers/net/wireless/rt2x00/rt61pci.c
> +++ b/drivers/net/wireless/rt2x00/rt61pci.c
> @@ -1717,8 +1717,7 @@ static int rt61pci_init_bbp(struct rt2x00_dev *rt2x00dev)
>  static void rt61pci_toggle_irq(struct rt2x00_dev *rt2x00dev,
>  			       enum dev_state state)
>  {
> -	int mask = (state == STATE_RADIO_IRQ_OFF) ||
> -		   (state == STATE_RADIO_IRQ_OFF_ISR);
> +	int mask = (state == STATE_RADIO_IRQ_OFF);
>  	u32 reg;
>  	unsigned long flags;
>  
> @@ -1852,9 +1851,7 @@ static int rt61pci_set_device_state(struct rt2x00_dev *rt2x00dev,
>  		rt61pci_disable_radio(rt2x00dev);
>  		break;
>  	case STATE_RADIO_IRQ_ON:
> -	case STATE_RADIO_IRQ_ON_ISR:
>  	case STATE_RADIO_IRQ_OFF:
> -	case STATE_RADIO_IRQ_OFF_ISR:
>  		rt61pci_toggle_irq(rt2x00dev, state);
>  		break;
>  	case STATE_DEEP_SLEEP:
> diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c
> index 61b9ac2..ac43681 100644
> --- a/drivers/net/wireless/rt2x00/rt73usb.c
> +++ b/drivers/net/wireless/rt2x00/rt73usb.c
> @@ -1428,9 +1428,7 @@ static int rt73usb_set_device_state(struct rt2x00_dev *rt2x00dev,
>  		rt73usb_disable_radio(rt2x00dev);
>  		break;
>  	case STATE_RADIO_IRQ_ON:
> -	case STATE_RADIO_IRQ_ON_ISR:
>  	case STATE_RADIO_IRQ_OFF:
> -	case STATE_RADIO_IRQ_OFF_ISR:
>  		/* No support, but no error either */
>  		break;
>  	case STATE_DEEP_SLEEP: