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

mt76: fix some checkpatch warnings 



This fixes the following checkpatch warnings:
CHECK: Alignment should match open parenthesis
CHECK: No space is necessary after a cast

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

drivers/net/wireless/mediatek/mt76/agg-rx.c

+12 −11
Original line number Diff line number Diff line
@@ -23,7 +23,8 @@ mt76_aggr_release(struct mt76_rx_tid *tid, struct sk_buff_head *frames, int idx) 
}



static void

mt76_rx_aggr_release_frames(struct mt76_rx_tid *tid, struct sk_buff_head *frames,

mt76_rx_aggr_release_frames(struct mt76_rx_tid *tid,

			    struct sk_buff_head *frames,

			    u16 head)

{

	int idx;
@@ -63,15 +64,14 @@ mt76_rx_aggr_check_release(struct mt76_rx_tid *tid, struct sk_buff_head *frames) 
	for (idx = (tid->head + 1) % tid->size;

	     idx != start && nframes;

	     idx = (idx + 1) % tid->size) {



		skb = tid->reorder_buf[idx];

		if (!skb)

			continue;



		nframes--;

		status = (struct mt76_rx_status *)skb->cb;

		if (!time_after(jiffies, status->reorder_time +

					 REORDER_TIMEOUT))

		if (!time_after(jiffies,

				status->reorder_time + REORDER_TIMEOUT))

			continue;



		mt76_rx_aggr_release_frames(tid, frames, status->seqno);
@@ -222,7 +222,8 @@ void mt76_rx_aggr_reorder(struct sk_buff *skb, struct sk_buff_head *frames) 
	tid->nframes++;

	mt76_rx_aggr_release_head(tid, frames);



	ieee80211_queue_delayed_work(tid->dev->hw, &tid->reorder_work, REORDER_TIMEOUT);

	ieee80211_queue_delayed_work(tid->dev->hw, &tid->reorder_work,

				     REORDER_TIMEOUT);



out:

	spin_unlock_bh(&tid->lock);

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

+16 −14
Original line number Diff line number Diff line
@@ -509,8 +509,10 @@ struct ieee80211_sta *mt76_rx_convert(struct sk_buff *skb) 
	status->chains = mstat.chains;



	BUILD_BUG_ON(sizeof(mstat) > sizeof(skb->cb));

	BUILD_BUG_ON(sizeof(status->chain_signal) != sizeof(mstat.chain_signal));

	memcpy(status->chain_signal, mstat.chain_signal, sizeof(mstat.chain_signal));

	BUILD_BUG_ON(sizeof(status->chain_signal) !=

		     sizeof(mstat.chain_signal));

	memcpy(status->chain_signal, mstat.chain_signal,

	       sizeof(mstat.chain_signal));



	return wcid_to_sta(mstat.wcid);

}

drivers/net/wireless/mediatek/mt76/mt7615/mac.c

+2 −1
Original line number Diff line number Diff line
@@ -337,7 +337,8 @@ int mt7615_mac_write_txwi(struct mt7615_dev *dev, __le32 *txwi, 
	fc_stype = (le16_to_cpu(fc) & IEEE80211_FCTL_STYPE) >> 4;



	if (ieee80211_is_data(fc) || ieee80211_is_bufferable_mmpdu(fc)) {

		q_idx = skb_get_queue_mapping(skb) + wmm_idx * MT7615_MAX_WMM_SETS;

		q_idx = wmm_idx * MT7615_MAX_WMM_SETS +

			skb_get_queue_mapping(skb);

		p_fmt = MT_TX_TYPE_CT;

	} else if (ieee80211_is_beacon(fc)) {

		q_idx = MT_LMAC_BCN0;

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

+5 −4
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@ 


#define MAXNAME		32

#define DEV_ENTRY	__array(char, wiphy_name, 32)

#define DEV_ASSIGN  strlcpy(__entry->wiphy_name, wiphy_name(dev->hw->wiphy), MAXNAME)

#define DEV_ASSIGN	strlcpy(__entry->wiphy_name,	\

				wiphy_name(dev->hw->wiphy), MAXNAME)

#define DEV_PR_FMT	"%s"

#define DEV_PR_ARG	__entry->wiphy_name

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

+9 −9
Original line number Diff line number Diff line
@@ -206,8 +206,8 @@ mt76_tx_status_skb_get(struct mt76_dev *dev, struct mt76_wcid *wcid, int pktid, 
		if (cb->pktid == pktid)

			return skb;



		if (pktid >= 0 &&

		    !time_after(jiffies, cb->jiffies + MT_TX_STATUS_SKB_TIMEOUT))

		if (pktid >= 0 && !time_after(jiffies, cb->jiffies +

					      MT_TX_STATUS_SKB_TIMEOUT))

			continue;



		__mt76_tx_status_skb_done(dev, skb, MT_TX_CB_TXS_FAILED |

CRA Git | Maintained and supported by SUSTech CRA and CCSE