Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b550911a authored by Helmut Schaa's avatar Helmut Schaa Committed by John W. Linville
Browse files

rt2x00: Remove STATE_RADIO_IRQ_OFF_ISR and STATE_RADIO_IRQ_ON_ISR 



Remove STATE_RADIO_IRQ_OFF_ISR and STATE_RADIO_IRQ_ON_ISR as they are
not used anymore.

Signed-off-by: default avatarHelmut Schaa <helmut.schaa@googlemail.com>
Acked-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e88399bc

drivers/net/wireless/rt2x00/rt2400pci.c

+1 −4
Original line number Diff line number Diff line
@@ -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:

drivers/net/wireless/rt2x00/rt2500pci.c

+1 −4
Original line number Diff line number Diff line
@@ -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:

drivers/net/wireless/rt2x00/rt2500usb.c

+0 −2
Original line number Diff line number Diff line
@@ -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:

drivers/net/wireless/rt2x00/rt2800pci.c

+1 −4
Original line number Diff line number Diff line
@@ -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:

drivers/net/wireless/rt2x00/rt2800usb.c

+0 −2
Original line number Diff line number Diff line
@@ -253,9 +253,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: