Skip to content

Commit

Permalink
mt7603: fix checkpatch issues
Browse files Browse the repository at this point in the history 
Signed-off-by: Felix Fietkau <nbd@nbd.name>
  • Loading branch information
@nbd168
nbd168 committed Dec 29, 2018
1 parent bce700d commit 148219d
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 21 deletions.
2 changes: 1 addition & 1 deletion mt7603/init.c
View file
Expand Up @@ -488,7 +488,7 @@ mt7603_init_txpower(struct mt7603_dev *dev,
struct ieee80211_supported_band *sband)
{
struct ieee80211_channel *chan;
u8 *eeprom = (u8 *) dev->mt76.eeprom.data;
u8 *eeprom = (u8 *)dev->mt76.eeprom.data;
int target_power = eeprom[MT_EE_TX_POWER_0_START_2G + 2] & ~BIT(7);
u8 *rate_power = &eeprom[MT_EE_TX_POWER_CCK];
int max_offset, cur_offset;
Expand Down
14 changes: 8 additions & 6 deletions mt7603/mac.c
View file
Expand Up @@ -842,6 +842,7 @@ mt7603_mac_write_txwi(struct mt7603_dev *dev, __le32 *txwi,

if (sta) {
struct mt7603_sta *msta = (struct mt7603_sta *)sta->drv_priv;

tx_count = msta->rate_count;
}

Expand Down Expand Up @@ -944,7 +945,7 @@ int mt7603_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,
wcid = &dev->global_sta.wcid;

if (sta) {
msta = (struct mt7603_sta *) sta->drv_priv;
msta = (struct mt7603_sta *)sta->drv_priv;

if ((info->flags & (IEEE80211_TX_CTL_NO_PS_BUFFER |
IEEE80211_TX_CTL_CLEAR_PS_FILT)) ||
Expand Down Expand Up @@ -1242,14 +1243,16 @@ void mt7603_mac_dma_start(struct mt7603_dev *dev)

void mt7603_mac_start(struct mt7603_dev *dev)
{
mt76_clear(dev, MT_ARB_SCR, MT_ARB_SCR_TX_DISABLE | MT_ARB_SCR_RX_DISABLE);
mt76_clear(dev, MT_ARB_SCR,
MT_ARB_SCR_TX_DISABLE | MT_ARB_SCR_RX_DISABLE);
mt76_wr(dev, MT_WF_ARB_TX_START_0, ~0);
mt76_set(dev, MT_WF_ARB_RQCR, MT_WF_ARB_RQCR_RX_START);
}

void mt7603_mac_stop(struct mt7603_dev *dev)
{
mt76_set(dev, MT_ARB_SCR, MT_ARB_SCR_TX_DISABLE | MT_ARB_SCR_RX_DISABLE);
mt76_set(dev, MT_ARB_SCR,
MT_ARB_SCR_TX_DISABLE | MT_ARB_SCR_RX_DISABLE);
mt76_wr(dev, MT_WF_ARB_TX_START_0, 0);
mt76_clear(dev, MT_WF_ARB_RQCR, MT_WF_ARB_RQCR_RX_START);
}
Expand Down Expand Up @@ -1676,8 +1679,7 @@ mt7603_false_cca_check(struct mt7603_dev *dev)
dev->sensitivity += 2;
dev->last_cca_adj = jiffies;
} else if (false_cca < 100 ||
time_after(jiffies, dev->last_cca_adj + 10 * HZ)) {

time_after(jiffies, dev->last_cca_adj + 10 * HZ)) {
dev->last_cca_adj = jiffies;
if (!dev->sensitivity)
goto out;
Expand Down Expand Up @@ -1717,7 +1719,7 @@ void mt7603_mac_work(struct work_struct *work)
mt7603_watchdog_check(dev, &dev->beacon_check,
RESET_CAUSE_BEACON_STUCK,
NULL) ||
mt7603_watchdog_check(dev, &dev->tx_dma_check,
mt7603_watchdog_check(dev, &dev->tx_dma_check,
RESET_CAUSE_TX_BUSY,
mt7603_tx_dma_busy) ||
mt7603_watchdog_check(dev, &dev->rx_dma_check,
Expand Down
18 changes: 11 additions & 7 deletions mt7603/main.c
View file
Expand Up @@ -53,12 +53,16 @@ mt7603_txq_init(struct mt7603_dev *dev, struct ieee80211_txq *txq)
if (!txq)
return;

mtxq = (struct mt76_txq *) txq->drv_priv;
mtxq = (struct mt76_txq *)txq->drv_priv;
if (txq->sta) {
struct mt7603_sta *sta = (struct mt7603_sta *)txq->sta->drv_priv;
struct mt7603_sta *sta;

sta = (struct mt7603_sta *)txq->sta->drv_priv;
mtxq->wcid = &sta->wcid;
} else {
struct mt7603_vif *mvif = (struct mt7603_vif *)txq->vif->drv_priv;
struct mt7603_vif *mvif;

mvif = (struct mt7603_vif *)txq->vif->drv_priv;
mtxq->wcid = &mvif->sta.wcid;
}

Expand Down Expand Up @@ -146,7 +150,7 @@ mt7603_init_edcca(struct mt7603_dev *dev)
static int
mt7603_set_channel(struct mt7603_dev *dev, struct cfg80211_chan_def *def)
{
u8 *rssi_data = (u8 *) dev->mt76.eeprom.data;
u8 *rssi_data = (u8 *)dev->mt76.eeprom.data;
int idx, ret;
u8 bw = MT_BW_20;
bool failed = false;
Expand Down Expand Up @@ -351,7 +355,7 @@ mt7603_sta_remove(struct mt76_dev *mdev, struct ieee80211_vif *vif,
{
struct mt7603_dev *dev = container_of(mdev, struct mt7603_dev, mt76);
struct mt7603_sta *msta = (struct mt7603_sta *)sta->drv_priv;
struct mt76_wcid *wcid = (struct mt76_wcid *) sta->drv_priv;
struct mt76_wcid *wcid = (struct mt76_wcid *)sta->drv_priv;

spin_lock_bh(&dev->ps_lock);
__skb_queue_purge(&msta->psq);
Expand Down Expand Up @@ -619,8 +623,8 @@ mt7603_sta_rate_tbl_update(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
spin_unlock_bh(&dev->mt76.lock);
}

static void mt7603_set_coverage_class(struct ieee80211_hw *hw,
s16 coverage_class)
static void
mt7603_set_coverage_class(struct ieee80211_hw *hw, s16 coverage_class)
{
struct mt7603_dev *dev = hw->priv;

Expand Down
18 changes: 11 additions & 7 deletions mt7603/mcu.c
View file
Expand Up @@ -67,7 +67,8 @@ mt7603_mcu_get_response(struct mt7603_dev *dev, unsigned long expires)
}

static int
__mt7603_mcu_msg_send(struct mt7603_dev *dev, struct sk_buff *skb, int cmd, int query, int *wait_seq)
__mt7603_mcu_msg_send(struct mt7603_dev *dev, struct sk_buff *skb, int cmd,
int query, int *wait_seq)
{
int hdrlen = dev->mcu_running ? sizeof(struct mt7603_mcu_txd) : 12;
struct mt76_dev *mdev = &dev->mt76;
Expand Down Expand Up @@ -110,7 +111,8 @@ __mt7603_mcu_msg_send(struct mt7603_dev *dev, struct sk_buff *skb, int cmd, int
}

static int
mt7603_mcu_msg_send(struct mt7603_dev *dev, struct sk_buff *skb, int cmd, int query)
mt7603_mcu_msg_send(struct mt7603_dev *dev, struct sk_buff *skb, int cmd,
int query)
{
struct mt76_dev *mdev = &dev->mt76;
unsigned long expires = jiffies + 3 * HZ;
Expand Down Expand Up @@ -177,7 +179,8 @@ mt7603_mcu_send_firmware(struct mt7603_dev *dev, const void *data, int len)
int ret = 0;

while (len > 0) {
int cur_len = min_t(int, 4096 - sizeof(struct mt7603_mcu_txd), len);
int cur_len = min_t(int, 4096 - sizeof(struct mt7603_mcu_txd),
len);

skb = mt7603_mcu_msg_alloc(data, cur_len);
if (!skb)
Expand Down Expand Up @@ -413,14 +416,14 @@ int mt7603_mcu_set_eeprom(struct mt7603_dev *dev)
struct sk_buff *skb;
struct req_data *data;
const int size = 0xff * sizeof(struct req_data);
u8 *eep = (u8 *) dev->mt76.eeprom.data;
u8 *eep = (u8 *)dev->mt76.eeprom.data;
int i;

BUILD_BUG_ON(ARRAY_SIZE(req_fields) * sizeof(*data) > size);

skb = mt7603_mcu_msg_alloc(NULL, size + sizeof(req_hdr));
memcpy(skb_put(skb, sizeof(req_hdr)), &req_hdr, sizeof(req_hdr));
data = (struct req_data *) skb_put(skb, size);
data = (struct req_data *)skb_put(skb, size);
memset(data, 0, size);

for (i = 0; i < ARRAY_SIZE(req_fields); i++) {
Expand All @@ -429,7 +432,8 @@ int mt7603_mcu_set_eeprom(struct mt7603_dev *dev)
data[i].pad = 0;
}

return mt7603_mcu_msg_send(dev, skb, MCU_EXT_CMD_EFUSE_BUFFER_MODE, MCU_Q_SET);
return mt7603_mcu_msg_send(dev, skb, MCU_EXT_CMD_EFUSE_BUFFER_MODE,
MCU_Q_SET);
}

static int mt7603_mcu_set_tx_power(struct mt7603_dev *dev)
Expand Down Expand Up @@ -465,7 +469,7 @@ static int mt7603_mcu_set_tx_power(struct mt7603_dev *dev)
#undef EEP_VAL
};
struct sk_buff *skb;
u8 *eep = (u8 *) dev->mt76.eeprom.data;
u8 *eep = (u8 *)dev->mt76.eeprom.data;

memcpy(req.rate_power_delta, eep + MT_EE_TX_POWER_CCK,
sizeof(req.rate_power_delta));
Expand Down

0 comments on commit 148219d

Please sign in to comment.