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

Commit adde5882 authored by Gabor Juhos's avatar Gabor Juhos Committed by John W. Linville
Browse files

rt2x00: fix whitespace damage in the rt2800 specific code 



The rt2800 specific code contains a lots of whitespace damage caused by
the commit 'rt2x00: Add support for RT5390 chip'.

This patch fixes those whitespace errors.

Signed-off-by: default avatarGabor Juhos <juhosg@openwrt.org>
Acked-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 ba9a6214

drivers/net/wireless/rt2x00/rt2800lib.c

+351 −342
Original line number Original line Diff line number Diff line
@@ -1614,7 +1614,8 @@ static void rt2800_config_channel_rf53xx(struct rt2x00_dev *rt2x00dev, 




	rt2800_rfcsr_read(rt2x00dev, 17, &rfcsr);

	rt2800_rfcsr_read(rt2x00dev, 17, &rfcsr);

	if (rt2x00dev->freq_offset > RT5390_FREQ_OFFSET_BOUND)

	if (rt2x00dev->freq_offset > RT5390_FREQ_OFFSET_BOUND)

               rt2x00_set_field8(&rfcsr, RFCSR17_CODE, RT5390_FREQ_OFFSET_BOUND);

		rt2x00_set_field8(&rfcsr, RFCSR17_CODE,

				  RT5390_FREQ_OFFSET_BOUND);

	else

	else

		rt2x00_set_field8(&rfcsr, RFCSR17_CODE, rt2x00dev->freq_offset);

		rt2x00_set_field8(&rfcsr, RFCSR17_CODE, rt2x00dev->freq_offset);

	rt2800_rfcsr_write(rt2x00dev, 17, rfcsr);

	rt2800_rfcsr_write(rt2x00dev, 17, rfcsr);
@@ -1633,8 +1634,10 @@ static void rt2800_config_channel_rf53xx(struct rt2x00_dev *rt2x00dev, 
					0x0e, 0x0e, 0x0e, 0x0b, 0x0a, 0x09,

					0x0e, 0x0e, 0x0e, 0x0b, 0x0a, 0x09,

					0x07, 0x07, 0x07, 0x07, 0x07, 0x07};

					0x07, 0x07, 0x07, 0x07, 0x07, 0x07};





                               rt2800_rfcsr_write(rt2x00dev, 55, r55_bt_rev[idx]);

				rt2800_rfcsr_write(rt2x00dev, 55,

                               rt2800_rfcsr_write(rt2x00dev, 59, r59_bt_rev[idx]);

						   r55_bt_rev[idx]);

				rt2800_rfcsr_write(rt2x00dev, 59,

						   r59_bt_rev[idx]);

			} else {

			} else {

				static const char r59_bt[] = {0x8b, 0x8b, 0x8b,

				static const char r59_bt[] = {0x8b, 0x8b, 0x8b,

					0x8b, 0x8b, 0x8b, 0x8b, 0x8a, 0x89,

					0x8b, 0x8b, 0x8b, 0x8b, 0x8a, 0x89,
@@ -1651,14 +1654,17 @@ static void rt2800_config_channel_rf53xx(struct rt2x00_dev *rt2x00dev, 
					0x07, 0x07, 0x07, 0x07, 0x07, 0x07,

					0x07, 0x07, 0x07, 0x07, 0x07, 0x07,

					0x07, 0x07, 0x06, 0x05, 0x04, 0x04};

					0x07, 0x07, 0x06, 0x05, 0x04, 0x04};





                               rt2800_rfcsr_write(rt2x00dev, 55, r55_nonbt_rev[idx]);

				rt2800_rfcsr_write(rt2x00dev, 55,

                               rt2800_rfcsr_write(rt2x00dev, 59, r59_nonbt_rev[idx]);

						   r55_nonbt_rev[idx]);

				rt2800_rfcsr_write(rt2x00dev, 59,

						   r59_nonbt_rev[idx]);

			} else if (rt2x00_rt(rt2x00dev, RT5390)) {

			} else if (rt2x00_rt(rt2x00dev, RT5390)) {

				static const char r59_non_bt[] = {0x8f, 0x8f,

				static const char r59_non_bt[] = {0x8f, 0x8f,

					0x8f, 0x8f, 0x8f, 0x8f, 0x8f, 0x8d,

					0x8f, 0x8f, 0x8f, 0x8f, 0x8f, 0x8d,

					0x8a, 0x88, 0x88, 0x87, 0x87, 0x86};

					0x8a, 0x88, 0x88, 0x87, 0x87, 0x86};





                               rt2800_rfcsr_write(rt2x00dev, 59, r59_non_bt[idx]);

				rt2800_rfcsr_write(rt2x00dev, 59,

						   r59_non_bt[idx]);

			}

			}

		}

		}

	}

	}
@@ -1712,7 +1718,8 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev, 




	if (rf->channel <= 14) {

	if (rf->channel <= 14) {

		if (!rt2x00_rt(rt2x00dev, RT5390)) {

		if (!rt2x00_rt(rt2x00dev, RT5390)) {

                       if (test_bit(CONFIG_EXTERNAL_LNA_BG, &rt2x00dev->flags)) {

			if (test_bit(CONFIG_EXTERNAL_LNA_BG,

				     &rt2x00dev->flags)) {

				rt2800_bbp_write(rt2x00dev, 82, 0x62);

				rt2800_bbp_write(rt2x00dev, 82, 0x62);

				rt2800_bbp_write(rt2x00dev, 75, 0x46);

				rt2800_bbp_write(rt2x00dev, 75, 0x46);

			} else {

			} else {
@@ -2728,7 +2735,8 @@ static int rt2800_init_bbp(struct rt2x00_dev *rt2x00dev) 
		int ant, div_mode;

		int ant, div_mode;





		rt2x00_eeprom_read(rt2x00dev, EEPROM_NIC_CONF1, &eeprom);

		rt2x00_eeprom_read(rt2x00dev, EEPROM_NIC_CONF1, &eeprom);

               div_mode = rt2x00_get_field16(eeprom, EEPROM_NIC_CONF1_ANT_DIVERSITY);

		div_mode = rt2x00_get_field16(eeprom,

					      EEPROM_NIC_CONF1_ANT_DIVERSITY);

		ant = (div_mode == 3) ? 1 : 0;

		ant = (div_mode == 3) ? 1 : 0;





		/* check if this is a Bluetooth combo card */

		/* check if this is a Bluetooth combo card */
@@ -3129,7 +3137,8 @@ static int rt2800_init_rfcsr(struct rt2x00_dev *rt2x00dev) 
		    rt2x00_rt_rev_lt(rt2x00dev, RT3071, REV_RT3071E) ||

		    rt2x00_rt_rev_lt(rt2x00dev, RT3071, REV_RT3071E) ||

		    rt2x00_rt_rev_lt(rt2x00dev, RT3090, REV_RT3090E) ||

		    rt2x00_rt_rev_lt(rt2x00dev, RT3090, REV_RT3090E) ||

		    rt2x00_rt_rev_lt(rt2x00dev, RT3390, REV_RT3390E)) {

		    rt2x00_rt_rev_lt(rt2x00dev, RT3390, REV_RT3390E)) {

                       if (!test_bit(CONFIG_EXTERNAL_LNA_BG, &rt2x00dev->flags))

			if (!test_bit(CONFIG_EXTERNAL_LNA_BG,

				      &rt2x00dev->flags))

				rt2x00_set_field8(&rfcsr, RFCSR17_R, 1);

				rt2x00_set_field8(&rfcsr, RFCSR17_R, 1);

		}

		}

		rt2x00_eeprom_read(rt2x00dev, EEPROM_TXMIXER_GAIN_BG, &eeprom);

		rt2x00_eeprom_read(rt2x00dev, EEPROM_TXMIXER_GAIN_BG, &eeprom);

drivers/net/wireless/rt2x00/rt2800pci.c

+7 −7

File changed.

Contains only whitespace changes.

drivers/net/wireless/rt2x00/rt2800.h

+20 −20

File changed.

Contains only whitespace changes.