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

Commit ea175ee2 authored by Ivo van Doorn's avatar Ivo van Doorn Committed by John W. Linville
Browse files

rt2x00: Remove rt2x00lib_toggle_rx 



As part of the queue refactoring, the rt2x00lib_toggle_rx
can be removed and replaced with the call directly to
the set_device_state callback function.

We can remove the STATE_RADIO_RX_ON_LINK and
STATE_RADIO_RX_OFF_LINK, as it was only used for
special behavior inside rt2x00lib rather then the
drivers.

Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Acked-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 8be4eed0

drivers/net/wireless/rt2x00/rt2400pci.c

+1 −4
Original line number Diff line number Diff line
@@ -885,8 +885,7 @@ static void rt2400pci_toggle_rx(struct rt2x00_dev *rt2x00dev, 


	rt2x00pci_register_read(rt2x00dev, RXCSR0, &reg);

	rt2x00_set_field32(&reg, RXCSR0_DISABLE_RX,

			   (state == STATE_RADIO_RX_OFF) ||

			   (state == STATE_RADIO_RX_OFF_LINK));

			   (state == STATE_RADIO_RX_OFF));

	rt2x00pci_register_write(rt2x00dev, RXCSR0, reg);

}
@@ -989,9 +988,7 @@ static int rt2400pci_set_device_state(struct rt2x00_dev *rt2x00dev, 
		rt2400pci_disable_radio(rt2x00dev);

		break;

	case STATE_RADIO_RX_ON:

	case STATE_RADIO_RX_ON_LINK:

	case STATE_RADIO_RX_OFF:

	case STATE_RADIO_RX_OFF_LINK:

		rt2400pci_toggle_rx(rt2x00dev, state);

		break;

	case STATE_RADIO_IRQ_ON:

drivers/net/wireless/rt2x00/rt2500pci.c

+1 −4
Original line number Diff line number Diff line
@@ -1040,8 +1040,7 @@ static void rt2500pci_toggle_rx(struct rt2x00_dev *rt2x00dev, 


	rt2x00pci_register_read(rt2x00dev, RXCSR0, &reg);

	rt2x00_set_field32(&reg, RXCSR0_DISABLE_RX,

			   (state == STATE_RADIO_RX_OFF) ||

			   (state == STATE_RADIO_RX_OFF_LINK));

			   (state == STATE_RADIO_RX_OFF));

	rt2x00pci_register_write(rt2x00dev, RXCSR0, reg);

}
@@ -1144,9 +1143,7 @@ static int rt2500pci_set_device_state(struct rt2x00_dev *rt2x00dev, 
		rt2500pci_disable_radio(rt2x00dev);

		break;

	case STATE_RADIO_RX_ON:

	case STATE_RADIO_RX_ON_LINK:

	case STATE_RADIO_RX_OFF:

	case STATE_RADIO_RX_OFF_LINK:

		rt2500pci_toggle_rx(rt2x00dev, state);

		break;

	case STATE_RADIO_IRQ_ON:

drivers/net/wireless/rt2x00/rt2500usb.c

+1 −4
Original line number Diff line number Diff line
@@ -938,8 +938,7 @@ static void rt2500usb_toggle_rx(struct rt2x00_dev *rt2x00dev, 


	rt2500usb_register_read(rt2x00dev, TXRX_CSR2, &reg);

	rt2x00_set_field16(&reg, TXRX_CSR2_DISABLE_RX,

			   (state == STATE_RADIO_RX_OFF) ||

			   (state == STATE_RADIO_RX_OFF_LINK));

			   (state == STATE_RADIO_RX_OFF));

	rt2500usb_register_write(rt2x00dev, TXRX_CSR2, reg);

}
@@ -1019,9 +1018,7 @@ static int rt2500usb_set_device_state(struct rt2x00_dev *rt2x00dev, 
		rt2500usb_disable_radio(rt2x00dev);

		break;

	case STATE_RADIO_RX_ON:

	case STATE_RADIO_RX_ON_LINK:

	case STATE_RADIO_RX_OFF:

	case STATE_RADIO_RX_OFF_LINK:

		rt2500usb_toggle_rx(rt2x00dev, state);

		break;

	case STATE_RADIO_IRQ_ON:

drivers/net/wireless/rt2x00/rt2800pci.c

+1 −4
Original line number Diff line number Diff line
@@ -328,8 +328,7 @@ static void rt2800pci_toggle_rx(struct rt2x00_dev *rt2x00dev, 


	rt2800_register_read(rt2x00dev, MAC_SYS_CTRL, &reg);

	rt2x00_set_field32(&reg, MAC_SYS_CTRL_ENABLE_RX,

			   (state == STATE_RADIO_RX_ON) ||

			   (state == STATE_RADIO_RX_ON_LINK));

			   (state == STATE_RADIO_RX_ON));

	rt2800_register_write(rt2x00dev, MAC_SYS_CTRL, reg);

}
@@ -477,9 +476,7 @@ static int rt2800pci_set_device_state(struct rt2x00_dev *rt2x00dev, 
		rt2800pci_set_state(rt2x00dev, STATE_SLEEP);

		break;

	case STATE_RADIO_RX_ON:

	case STATE_RADIO_RX_ON_LINK:

	case STATE_RADIO_RX_OFF:

	case STATE_RADIO_RX_OFF_LINK:

		rt2800pci_toggle_rx(rt2x00dev, state);

		break;

	case STATE_RADIO_IRQ_ON:

drivers/net/wireless/rt2x00/rt2800usb.c

+1 −4
Original line number Diff line number Diff line
@@ -114,8 +114,7 @@ static void rt2800usb_toggle_rx(struct rt2x00_dev *rt2x00dev, 


	rt2800_register_read(rt2x00dev, MAC_SYS_CTRL, &reg);

	rt2x00_set_field32(&reg, MAC_SYS_CTRL_ENABLE_RX,

			   (state == STATE_RADIO_RX_ON) ||

			   (state == STATE_RADIO_RX_ON_LINK));

			   (state == STATE_RADIO_RX_ON));

	rt2800_register_write(rt2x00dev, MAC_SYS_CTRL, reg);

}
@@ -216,9 +215,7 @@ static int rt2800usb_set_device_state(struct rt2x00_dev *rt2x00dev, 
		rt2800usb_set_state(rt2x00dev, STATE_SLEEP);

		break;

	case STATE_RADIO_RX_ON:

	case STATE_RADIO_RX_ON_LINK:

	case STATE_RADIO_RX_OFF:

	case STATE_RADIO_RX_OFF_LINK:

		rt2800usb_toggle_rx(rt2x00dev, state);

		break;

	case STATE_RADIO_IRQ_ON: