Skip to content

Commit

Permalink
mt76x2: fix checkpatch warnings
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 Sep 4, 2016
1 parent 05e9617 commit d7f5112
Show file tree
Hide file tree
Showing 15 changed files with 166 additions and 118 deletions.
9 changes: 5 additions & 4 deletions mt76x2.h
View file
Expand Up @@ -180,10 +180,11 @@ void mt76x2_phy_calibrate(struct work_struct *work);
void mt76x2_phy_set_txpower(struct mt76x2_dev *dev);

int mt76x2_mcu_init(struct mt76x2_dev *dev);
int mt76x2_mcu_set_channel(struct mt76x2_dev *dev, u8 channel, u8 bw, u8 bw_index,
bool scan);
int mt76x2_mcu_set_channel(struct mt76x2_dev *dev, u8 channel, u8 bw,
u8 bw_index, bool scan);
int mt76x2_mcu_set_radio_state(struct mt76x2_dev *dev, bool on);
int mt76x2_mcu_load_cr(struct mt76x2_dev *dev, u8 type, u8 temp_level, u8 channel);
int mt76x2_mcu_load_cr(struct mt76x2_dev *dev, u8 type, u8 temp_level,
u8 channel);
int mt76x2_mcu_cleanup(struct mt76x2_dev *dev);

int mt76x2_dma_init(struct mt76x2_dev *dev);
Expand All @@ -194,7 +195,7 @@ void mt76x2_cleanup(struct mt76x2_dev *dev);
int mt76x2_tx_queue_mcu(struct mt76x2_dev *dev, enum mt76_txq_id qid,
struct sk_buff *skb, int cmd, int seq);
void mt76x2_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *control,
struct sk_buff *skb);
struct sk_buff *skb);
void mt76x2_tx_complete(struct mt76x2_dev *dev, struct sk_buff *skb);
int mt76x2_tx_prepare_skb(struct mt76_dev *dev, void *txwi_ptr,
struct sk_buff *skb, struct mt76_queue *q,
Expand Down
1 change: 1 addition & 0 deletions mt76x2_core.c
View file
Expand Up @@ -32,6 +32,7 @@ void mt76x2_set_irq_mask(struct mt76x2_dev *dev, u32 clear, u32 set)
void mt76x2_rx_poll_complete(struct mt76_dev *mdev, enum mt76_rxq_id q)
{
struct mt76x2_dev *dev = container_of(mdev, struct mt76x2_dev, mt76);

mt76x2_irq_enable(dev, MT_INT_RX_DONE(q));
}

Expand Down
3 changes: 2 additions & 1 deletion mt76x2_debugfs.c
View file
Expand Up @@ -96,5 +96,6 @@ void mt76x2_init_debugfs(struct mt76x2_dev *dev)
debugfs_create_bool("tpc", S_IRUSR | S_IWUSR, dir, &dev->enable_tpc);

debugfs_create_file("ampdu_stat", S_IRUSR, dir, dev, &fops_ampdu_stat);
debugfs_create_devm_seqfile(dev->mt76.dev, "txpower", dir, read_txpower);
debugfs_create_devm_seqfile(dev->mt76.dev, "txpower", dir,
read_txpower);
}
20 changes: 10 additions & 10 deletions mt76x2_dma.c
View file
Expand Up @@ -33,7 +33,8 @@ mt76x2_tx_queue_mcu(struct mt76x2_dev *dev, enum mt76_txq_id qid,
FIELD_PREP(MT_MCU_MSG_PORT, CPU_TX_PORT) |
FIELD_PREP(MT_MCU_MSG_LEN, skb->len);

addr = dma_map_single(dev->mt76.dev, skb->data, skb->len, DMA_TO_DEVICE);
addr = dma_map_single(dev->mt76.dev, skb->data, skb->len,
DMA_TO_DEVICE);
if (dma_mapping_error(dev->mt76.dev, addr))
return -ENOMEM;

Expand All @@ -49,7 +50,7 @@ mt76x2_tx_queue_mcu(struct mt76x2_dev *dev, enum mt76_txq_id qid,

static int
mt76x2_init_tx_queue(struct mt76x2_dev *dev, struct mt76_queue *q,
int idx, int n_desc)
int idx, int n_desc)
{
int ret;

Expand Down Expand Up @@ -79,16 +80,16 @@ void mt76x2_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,

skb_pull(skb, sizeof(struct mt76x2_rxwi));
if (mt76x2_mac_process_rx(dev, skb, rxwi)) {
dev_kfree_skb(skb);
return;
dev_kfree_skb(skb);
return;
}

mt76_rx(&dev->mt76, q, skb);
}

static int
mt76x2_init_rx_queue(struct mt76x2_dev *dev, struct mt76_queue *q,
int idx, int n_desc, int bufsize)
int idx, int n_desc, int bufsize)
{
int ret;

Expand Down Expand Up @@ -146,23 +147,22 @@ int mt76x2_dma_init(struct mt76x2_dev *dev)
mt76_wr(dev, MT_WPDMA_RST_IDX, ~0);

for (i = 0; i < ARRAY_SIZE(wmm_queue_map); i++) {
ret = mt76x2_init_tx_queue(dev, &dev->mt76.q_tx[i], wmm_queue_map[i],
MT_TX_RING_SIZE);
ret = mt76x2_init_tx_queue(dev, &dev->mt76.q_tx[i],
wmm_queue_map[i], MT_TX_RING_SIZE);
if (ret)
return ret;
}

ret = mt76x2_init_tx_queue(dev, &dev->mt76.q_tx[MT_TXQ_PSD],
MT_TX_HW_QUEUE_MGMT, MT_TX_RING_SIZE);
MT_TX_HW_QUEUE_MGMT, MT_TX_RING_SIZE);
if (ret)
return ret;

ret = mt76x2_init_tx_queue(dev, &dev->mt76.q_tx[MT_TXQ_MCU],
MT_TX_HW_QUEUE_MCU, MT_MCU_RING_SIZE);
MT_TX_HW_QUEUE_MCU, MT_MCU_RING_SIZE);
if (ret)
return ret;


ret = mt76x2_init_rx_queue(dev, &dev->mt76.q_rx[MT_RXQ_MCU], 1,
MT_MCU_RING_SIZE, MT_RX_BUF_SIZE);
if (ret)
Expand Down
46 changes: 28 additions & 18 deletions mt76x2_eeprom.c
View file
Expand Up @@ -22,7 +22,7 @@

static int
mt76x2_eeprom_copy(struct mt76x2_dev *dev, enum mt76x2_eeprom_field field,
void *dest, int len)
void *dest, int len)
{
if (field + len > dev->mt76.eeprom.size)
return -1;
Expand Down Expand Up @@ -84,8 +84,8 @@ mt76x2_efuse_read(struct mt76x2_dev *dev, u16 addr, u8 *data)
}

for (i = 0; i < 4; i++) {
val = mt76_rr(dev, MT_EFUSE_DATA(i));
put_unaligned_le32(val, data + 4 * i);
val = mt76_rr(dev, MT_EFUSE_DATA(i));
put_unaligned_le32(val, data + 4 * i);
}

return 0;
Expand All @@ -108,28 +108,29 @@ mt76x2_get_efuse_data(struct mt76x2_dev *dev, void *buf, int len)
static bool
mt76x2_has_cal_free_data(struct mt76x2_dev *dev, u8 *efuse)
{
if (get_unaligned_le16(efuse + MT_EE_NIC_CONF_0) != 0)
u16 *efuse_w = (u16 *) efuse;

if (efuse_w[MT_EE_NIC_CONF_0] != 0)
return false;

if (get_unaligned_le16(efuse + MT_EE_XTAL_TRIM_1) == 0xffff)
if (efuse_w[MT_EE_XTAL_TRIM_1] == 0xffff)
return false;

if (get_unaligned_le16(efuse + MT_EE_TX_POWER_DELTA_BW40) != 0)
if (efuse_w[MT_EE_TX_POWER_DELTA_BW40] != 0)
return false;

if (get_unaligned_le16(efuse + MT_EE_TX_POWER_0_START_2G) == 0xffff)
if (efuse_w[MT_EE_TX_POWER_0_START_2G] == 0xffff)
return false;

if (get_unaligned_le16(efuse + MT_EE_TX_POWER_0_GRP3_TX_POWER_DELTA) != 0)
if (efuse_w[MT_EE_TX_POWER_0_GRP3_TX_POWER_DELTA] != 0)
return false;

if (get_unaligned_le16(efuse + MT_EE_TX_POWER_0_GRP4_TSSI_SLOPE) == 0xffff)
if (efuse_w[MT_EE_TX_POWER_0_GRP4_TSSI_SLOPE] == 0xffff)
return false;

return true;
}


static void
mt76x2_apply_cal_free_data(struct mt76x2_dev *dev, u8 *efuse)
{
Expand Down Expand Up @@ -172,16 +173,19 @@ mt76x2_apply_cal_free_data(struct mt76x2_dev *dev, u8 *efuse)
int i;

if (!mt76x2_has_cal_free_data(dev, efuse))
return;
return;

for (i = 0; i < ARRAY_SIZE(cal_free_bytes); i++) {
int offset = cal_free_bytes[i];
eeprom[offset] = efuse[offset];
int offset = cal_free_bytes[i];

eeprom[offset] = efuse[offset];
}

if (!(efuse[MT_EE_TX_POWER_0_START_5G] | efuse[MT_EE_TX_POWER_0_START_5G + 1]))
if (!(efuse[MT_EE_TX_POWER_0_START_5G] |
efuse[MT_EE_TX_POWER_0_START_5G + 1]))
memcpy(eeprom + MT_EE_TX_POWER_0_START_5G, prev_grp0, 2);
if (!(efuse[MT_EE_TX_POWER_1_START_5G] | efuse[MT_EE_TX_POWER_1_START_5G + 1]))
if (!(efuse[MT_EE_TX_POWER_1_START_5G] |
efuse[MT_EE_TX_POWER_1_START_5G + 1]))
memcpy(eeprom + MT_EE_TX_POWER_1_START_5G, prev_grp0 + 2, 2);

val = get_unaligned_le16(efuse + MT_EE_BT_RCAL_RESULT);
Expand All @@ -205,7 +209,7 @@ static int mt76x2_check_eeprom(struct mt76x2_dev *dev)
case 0x7612:
return 0;
default:
printk("EEPROM data check failed: %04x\n", val);
dev_err(dev->mt76.dev, "EEPROM data check failed: %04x\n", val);
return -EINVAL;
}
}
Expand Down Expand Up @@ -255,14 +259,17 @@ static inline int
mt76x2_sign_extend(u32 val, unsigned size)
{
bool sign = val & BIT(size - 1);

val &= BIT(size - 1) - 1;

return sign ? val : -val;
}

static inline int
mt76x2_sign_extend_optional(u32 val, unsigned size)
{
bool enable = val & BIT(size);

return enable ? mt76x2_sign_extend(val, size) : 0;
}

Expand Down Expand Up @@ -319,8 +326,9 @@ mt76x2_get_cal_channel_group(int channel)
static u8
mt76x2_get_5g_rx_gain(struct mt76x2_dev *dev, u8 channel)
{
enum mt76x2_cal_channel_group group = mt76x2_get_cal_channel_group(channel);
enum mt76x2_cal_channel_group group;

group = mt76x2_get_cal_channel_group(channel);
switch (group) {
case MT_CH_5G_JAPAN:
return mt76x2_eeprom_get(dev, MT_EE_RF_5G_GRP0_1_RX_HIGH_GAIN);
Expand Down Expand Up @@ -502,11 +510,12 @@ mt76x2_get_power_info_5g(struct mt76x2_dev *dev, struct mt76x2_tx_power_info *t,
int chain, int offset)
{
int channel = dev->mt76.chandef.chan->hw_value;
enum mt76x2_cal_channel_group group = mt76x2_get_cal_channel_group(channel);
enum mt76x2_cal_channel_group group;
int delta_idx;
u16 val;
u8 data[5];

group = mt76x2_get_cal_channel_group(channel);
offset += group * MT_TX_POWER_GROUP_SIZE_5G;

if (channel >= 192)
Expand Down Expand Up @@ -548,6 +557,7 @@ mt76x2_get_power_info_5g(struct mt76x2_dev *dev, struct mt76x2_tx_power_info *t,
void mt76x2_get_power_info(struct mt76x2_dev *dev, struct mt76x2_tx_power_info *t)
{
u16 bw40, bw80;

memset(t, 0, sizeof(*t));

bw40 = mt76x2_eeprom_get(dev, MT_EE_TX_POWER_DELTA_BW40);
Expand Down
5 changes: 2 additions & 3 deletions mt76x2_eeprom.h
View file
Expand Up @@ -54,7 +54,6 @@ enum mt76x2_eeprom_field {

MT_EE_TX_POWER_1_START_5G = 0x080,


MT_EE_TX_POWER_CCK = 0x0a0,
MT_EE_TX_POWER_OFDM_2G_6M = 0x0a2,
MT_EE_TX_POWER_OFDM_2G_24M = 0x0a4,
Expand Down Expand Up @@ -147,7 +146,8 @@ mt76x2_eeprom_get(struct mt76x2_dev *dev, enum mt76x2_eeprom_field field)
}

void mt76x2_get_rate_power(struct mt76x2_dev *dev, struct mt76_rate_power *t);
void mt76x2_get_power_info(struct mt76x2_dev *dev, struct mt76x2_tx_power_info *t);
void mt76x2_get_power_info(struct mt76x2_dev *dev,
struct mt76x2_tx_power_info *t);
int mt76x2_get_temp_comp(struct mt76x2_dev *dev, struct mt76x2_temp_comp *t);
bool mt76x2_ext_pa_enabled(struct mt76x2_dev *dev, enum nl80211_band band);
void mt76x2_read_rx_gain(struct mt76x2_dev *dev);
Expand All @@ -167,7 +167,6 @@ mt76x2_tssi_enabled(struct mt76x2_dev *dev)
MT_EE_NIC_CONF_1_TX_ALC_EN);
}


static inline bool
mt76x2_has_ext_lna(struct mt76x2_dev *dev)
{
Expand Down
11 changes: 6 additions & 5 deletions mt76x2_init.c
View file
Expand Up @@ -37,7 +37,7 @@ mt76x2_wait_for_mac(struct mt76x2_dev *dev)
default:
return true;
}
msleep(5);
usleep_range(5000, 10000);
}

return false;
Expand Down Expand Up @@ -265,7 +265,7 @@ int mt76x2_mac_reset(struct mt76x2_dev *dev, bool hard)

mt76_wr(dev, MT_RF_BYPASS_0, 0x06000000);
mt76_wr(dev, MT_RF_SETTING_0, 0x08800000);
msleep(5);
usleep_range(5000, 10000);
mt76_wr(dev, MT_RF_BYPASS_0, 0x00000000);

mt76_wr(dev, MT_MCU_CLOCK_CTL, 0x1401);
Expand Down Expand Up @@ -334,7 +334,7 @@ int mt76x2_mac_start(struct mt76x2_dev *dev)

mt76_wr(dev, MT_MAC_SYS_CTRL, MT_MAC_SYS_CTRL_ENABLE_TX);
wait_for_wpdma(dev);
udelay(50);
usleep_range(50, 100);

mt76_set(dev, MT_WPDMA_GLO_CFG,
MT_WPDMA_GLO_CFG_TX_DMA_EN |
Expand All @@ -348,7 +348,8 @@ int mt76x2_mac_start(struct mt76x2_dev *dev)
MT_MAC_SYS_CTRL_ENABLE_TX |
MT_MAC_SYS_CTRL_ENABLE_RX);

mt76x2_irq_enable(dev, MT_INT_RX_DONE_ALL | MT_INT_TX_DONE_ALL | MT_INT_TX_STAT);
mt76x2_irq_enable(dev, MT_INT_RX_DONE_ALL | MT_INT_TX_DONE_ALL |
MT_INT_TX_STAT);

return 0;
}
Expand Down Expand Up @@ -395,7 +396,6 @@ void mt76x2_mac_resume(struct mt76x2_dev *dev)
MT_MAC_SYS_CTRL_ENABLE_RX);
}


static void
mt76x2_power_on_rf_patch(struct mt76x2_dev *dev)
{
Expand Down Expand Up @@ -724,6 +724,7 @@ int mt76x2_register_device(struct mt76x2_dev *dev)

for (i = 0; i < ARRAY_SIZE(dev->macaddr_list); i++) {
u8 *addr = dev->macaddr_list[i].addr;

memcpy(addr, dev->mt76.macaddr, ETH_ALEN);

if (!i)
Expand Down

0 comments on commit d7f5112

Please sign in to comment.