Commit ff97c52a authored by Ryder Lee's avatar Ryder Lee Committed by Felix Fietkau
Browse files

mt76: mt76x02: fix some checkpatch warnings 



This fixes the following checkpatch warnings:

ERROR: code indent should use tabs where possible
CHECK: Alignment should match open parenthesis
CHECK: No space is necessary after a cast
CHECK: Please don't use multiple blank lines
CHECK: Avoid precedence issues in macro
WARNING: Statements should start on a tabstop
WARNING: Unnecessary space before function pointer arguments

Signed-off-by: default avatarRyder Lee <ryder.lee@mediatek.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 0dacf9d3

drivers/net/wireless/mediatek/mt76/mt76x0/phy.c

+22 −18
Original line number Diff line number Diff line
@@ -230,7 +230,8 @@ mt76x0_phy_set_band(struct mt76x02_dev *dev, enum nl80211_band band) 
}



static void

mt76x0_phy_set_chan_rf_params(struct mt76x02_dev *dev, u8 channel, u16 rf_bw_band)

mt76x0_phy_set_chan_rf_params(struct mt76x02_dev *dev, u8 channel,

			      u16 rf_bw_band)

{

	const struct mt76x0_freq_item *freq_item;

	u16 rf_band = rf_bw_band & 0xff00;
@@ -252,9 +253,9 @@ mt76x0_phy_set_chan_rf_params(struct mt76x02_dev *dev, u8 channel, u16 rf_bw_ban 
			rf_band = mt76x0_frequency_plan[i].band;



			if (b_sdm)

				freq_item = &(mt76x0_sdm_frequency_plan[i]);

				freq_item = &mt76x0_sdm_frequency_plan[i];

			else

				freq_item = &(mt76x0_frequency_plan[i]);

				freq_item = &mt76x0_frequency_plan[i];



			mt76x0_rf_wr(dev, MT_RF(0, 37), freq_item->pllR37);

			mt76x0_rf_wr(dev, MT_RF(0, 36), freq_item->pllR36);
@@ -359,10 +360,11 @@ mt76x0_phy_set_chan_rf_params(struct mt76x02_dev *dev, u8 channel, u16 rf_bw_ban 


	band = (rf_band & RF_G_BAND) ? NL80211_BAND_2GHZ : NL80211_BAND_5GHZ;

	if (mt76x02_ext_pa_enabled(dev, band)) {

		/*

			MT_RF_MISC (offset: 0x0518)

			[2]1'b1: enable external A band PA, 1'b0: disable external A band PA

			[3]1'b1: enable external G band PA, 1'b0: disable external G band PA

		/* MT_RF_MISC (offset: 0x0518)

		 * [2]1'b1: enable external A band PA

		 *    1'b0: disable external A band PA

		 * [3]1'b1: enable external G band PA

		 *    1'b0: disable external G band PA

		 */

		if (rf_band & RF_A_BAND)

			mt76_set(dev, MT_RF_MISC, BIT(2));
@@ -385,7 +387,9 @@ mt76x0_phy_set_chan_rf_params(struct mt76x02_dev *dev, u8 channel, u16 rf_bw_ban 
		mt76_wr(dev, MT_TX_ALC_CFG_1, mac_reg);

	} else {

		mt76_wr(dev, MT_TX0_RF_GAIN_ATTEN, 0x686A7800);

		/* Set Atten mode = 0 For Ext A band, Disable Tx Inc dcoc Cal. */

		/* Set Atten mode = 0

		 * For Ext A band, Disable Tx Inc dcoc Cal.

		 */

		mac_reg = mt76_rr(dev, MT_TX_ALC_CFG_1);

		mac_reg &= 0x890400FF;

		mt76_wr(dev, MT_TX_ALC_CFG_1, mac_reg);
@@ -1169,7 +1173,8 @@ static void mt76x0_phy_rf_init(struct mt76x02_dev *dev) 


		if (item->bw_band == RF_BW_20)

			mt76x0_rf_wr(dev, item->rf_bank_reg, item->value);

		else if (((RF_G_BAND | RF_BW_20) & item->bw_band) == (RF_G_BAND | RF_BW_20))

		else if (((RF_G_BAND | RF_BW_20) & item->bw_band) ==

			  (RF_G_BAND | RF_BW_20))

			mt76x0_rf_wr(dev, item->rf_bank_reg, item->value);

	}
@@ -1181,10 +1186,9 @@ static void mt76x0_phy_rf_init(struct mt76x02_dev *dev) 
		}

	}



	/*

	   Frequency calibration

	   E1: B0.R22<6:0>: xo_cxo<6:0>

	   E2: B0.R21<0>: xo_cxo<0>, B0.R22<7:0>: xo_cxo<8:1>

	/* Frequency calibration

	 * E1: B0.R22<6:0>: xo_cxo<6:0>

	 * E2: B0.R21<0>: xo_cxo<0>, B0.R22<7:0>: xo_cxo<8:1>

	 */

	mt76x0_rf_wr(dev, MT_RF(0, 22),

		     min_t(u8, dev->cal.rx.freq_offset, 0xbf));

drivers/net/wireless/mediatek/mt76/mt76x0/phy.h

+5 −5
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ 
#define RF_BW_80        8



#define MT_RF(bank, reg)		((bank) << 16 | (reg))

#define MT_RF_BANK(offset) (offset >> 16)

#define MT_RF_REG(offset) (offset & 0xff)

#define MT_RF_BANK(offset)		((offset) >> 16)

#define MT_RF_REG(offset)		((offset) & 0xff)



#define MT_RF_VCO_BP_CLOSE_LOOP		BIT(3)

#define MT_RF_VCO_BP_CLOSE_LOOP_MASK	GENMASK(3, 0)

drivers/net/wireless/mediatek/mt76/mt76x0/usb.c

+9 −7
Original line number Diff line number Diff line
@@ -33,10 +33,12 @@ static struct usb_device_id mt76x0_device_table[] = { 
	{ USB_DEVICE(0x7392, 0xc711) }, /* Devolo Wifi ac Stick */

	{ USB_DEVICE(0x0df6, 0x0079) }, /* Sitecom Europe B.V. ac  Stick */

	{ USB_DEVICE(0x2357, 0x0123) }, /* TP-LINK T2UHP */

	{ USB_DEVICE(0x2357, 0x0105),

	  .driver_info = 1,	     }, /* TP-LINK Archer T1U */

	{ USB_DEVICE_AND_INTERFACE_INFO(0x0E8D, 0x7630, 0xff, 0x2, 0xff)}, /* MT7630U */

	{ USB_DEVICE_AND_INTERFACE_INFO(0x0E8D, 0x7650, 0xff, 0x2, 0xff)}, /* MT7650U */

	/* TP-LINK Archer T1U */

	{ USB_DEVICE(0x2357, 0x0105), .driver_info = 1, },

	/* MT7630U */

	{ USB_DEVICE_AND_INTERFACE_INFO(0x0E8D, 0x7630, 0xff, 0x2, 0xff)},

	/* MT7650U */

	{ USB_DEVICE_AND_INTERFACE_INFO(0x0E8D, 0x7650, 0xff, 0x2, 0xff)},

	{ 0, }

};
@@ -237,7 +239,7 @@ static int mt76x0u_probe(struct usb_interface *usb_intf, 
	if (ret)

		goto err;



	/* Disable the HW, otherwise MCU fail to initalize on hot reboot */

	/* Disable the HW, otherwise MCU fail to initialize on hot reboot */

	mt76x0_chip_onoff(dev, false, false);



	if (!mt76x02_wait_for_mac(mdev)) {
@@ -275,9 +277,9 @@ static int mt76x0u_probe(struct usb_interface *usb_intf, 
static void mt76x0_disconnect(struct usb_interface *usb_intf)

{

	struct mt76x02_dev *dev = usb_get_intfdata(usb_intf);

	bool initalized = test_bit(MT76_STATE_INITIALIZED, &dev->mt76.state);

	bool initialized = test_bit(MT76_STATE_INITIALIZED, &dev->mt76.state);



	if (!initalized)

	if (!initialized)

		return;



	ieee80211_unregister_hw(dev->mt76.hw);

drivers/net/wireless/mediatek/mt76/mt76x02.h

+13 −12
Original line number Diff line number Diff line
@@ -71,8 +71,8 @@ struct mt76x02_calibration { 
struct mt76x02_beacon_ops {

	unsigned int nslots;

	unsigned int slot_size;

	void (*pre_tbtt_enable) (struct mt76x02_dev *, bool);

	void (*beacon_enable) (struct mt76x02_dev *, bool);

	void (*pre_tbtt_enable)(struct mt76x02_dev *dev, bool en);

	void (*beacon_enable)(struct mt76x02_dev *dev, bool en);

};



struct mt76x02_dev {
@@ -197,6 +197,7 @@ struct beacon_bc_data { 
	struct sk_buff_head q;

	struct sk_buff *tail[8];

};



void mt76x02_init_beacon_config(struct mt76x02_dev *dev);

void mt76x02e_init_beacon_config(struct mt76x02_dev *dev);

void mt76x02_resync_beacon_timer(struct mt76x02_dev *dev);

drivers/net/wireless/mediatek/mt76/mt76x02_beacon.c

+2 −2
Original line number Diff line number Diff line
@@ -237,7 +237,8 @@ mt76x02_add_buffered_bc(void *priv, u8 *mac, struct ieee80211_vif *vif) 
}



void

mt76x02_enqueue_buffered_bc(struct mt76x02_dev *dev, struct beacon_bc_data *data,

mt76x02_enqueue_buffered_bc(struct mt76x02_dev *dev,

			    struct beacon_bc_data *data,

			    int max_nframes)

{

	int i, nframes;
@@ -281,4 +282,3 @@ void mt76x02_init_beacon_config(struct mt76x02_dev *dev) 
}

EXPORT_SYMBOL_GPL(mt76x02_init_beacon_config);