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

Commit 7ad63035 authored by Gertjan van Wingerde's avatar Gertjan van Wingerde Committed by John W. Linville
Browse files

rt2x00: Clean up RFCSR1 programming in rt2800_config_channel_rf3xxx. 



Setting of the individual fields of the RF register can be simplified.

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

drivers/net/wireless/rt2x00/rt2800lib.c

+8 −29
Original line number Diff line number Diff line
@@ -1763,36 +1763,15 @@ static void rt2800_config_channel_rf3xxx(struct rt2x00_dev *rt2x00dev, 


	rt2800_rfcsr_read(rt2x00dev, 1, &rfcsr);

	rt2x00_set_field8(&rfcsr, RFCSR1_RX0_PD, 0);

	rt2x00_set_field8(&rfcsr, RFCSR1_TX0_PD, 0);

	if (rt2x00_rt(rt2x00dev, RT3390)) {

	rt2x00_set_field8(&rfcsr, RFCSR1_RX1_PD,

				  rt2x00dev->default_ant.rx_chain_num == 1);

			  rt2x00dev->default_ant.rx_chain_num <= 1);

	rt2x00_set_field8(&rfcsr, RFCSR1_RX2_PD,

			  rt2x00dev->default_ant.rx_chain_num <= 2);

	rt2x00_set_field8(&rfcsr, RFCSR1_TX0_PD, 0);

	rt2x00_set_field8(&rfcsr, RFCSR1_TX1_PD,

				  rt2x00dev->default_ant.tx_chain_num == 1);

	} else {

		rt2x00_set_field8(&rfcsr, RFCSR1_RX1_PD, 0);

		rt2x00_set_field8(&rfcsr, RFCSR1_TX1_PD, 0);

		rt2x00_set_field8(&rfcsr, RFCSR1_RX2_PD, 0);

		rt2x00_set_field8(&rfcsr, RFCSR1_TX2_PD, 0);



		switch (rt2x00dev->default_ant.tx_chain_num) {

		case 1:

			rt2x00_set_field8(&rfcsr, RFCSR1_TX1_PD, 1);

			/* fall through */

		case 2:

			rt2x00_set_field8(&rfcsr, RFCSR1_TX2_PD, 1);

			break;

		}



		switch (rt2x00dev->default_ant.rx_chain_num) {

		case 1:

			rt2x00_set_field8(&rfcsr, RFCSR1_RX1_PD, 1);

			/* fall through */

		case 2:

			rt2x00_set_field8(&rfcsr, RFCSR1_RX2_PD, 1);

			break;

		}

	}

			  rt2x00dev->default_ant.tx_chain_num <= 1);

	rt2x00_set_field8(&rfcsr, RFCSR1_TX2_PD,

			  rt2x00dev->default_ant.tx_chain_num <= 2);

	rt2800_rfcsr_write(rt2x00dev, 1, rfcsr);



	rt2800_rfcsr_read(rt2x00dev, 30, &rfcsr);