Skip to content

Commit

Permalink
mt76x2: fix more checkpatch errors
Browse files Browse the repository at this point in the history
Signed-off-by: Felix Fietkau <nbd@nbd.name>
  • Loading branch information
nbd168 committed Sep 5, 2016
1 parent d7f5112 commit becce8b
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 7 deletions.
8 changes: 5 additions & 3 deletions mt76x2_eeprom.c
Expand Up @@ -204,6 +204,7 @@ mt76x2_apply_cal_free_data(struct mt76x2_dev *dev, u8 *efuse)
static int mt76x2_check_eeprom(struct mt76x2_dev *dev)
{
u16 val = get_unaligned_le16(dev->mt76.eeprom.data);

switch (val) {
case 0x7662:
case 0x7612:
Expand Down Expand Up @@ -256,7 +257,7 @@ mt76x2_eeprom_load(struct mt76x2_dev *dev)
}

static inline int
mt76x2_sign_extend(u32 val, unsigned size)
mt76x2_sign_extend(u32 val, unsigned int size)
{
bool sign = val & BIT(size - 1);

Expand All @@ -266,7 +267,7 @@ mt76x2_sign_extend(u32 val, unsigned size)
}

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

Expand Down Expand Up @@ -554,7 +555,8 @@ mt76x2_get_power_info_5g(struct mt76x2_dev *dev, struct mt76x2_tx_power_info *t,
t->target_power = val & 0xff;
}

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)
{
u16 bw40, bw80;

Expand Down
2 changes: 1 addition & 1 deletion mt76x2_eeprom.h
Expand Up @@ -164,7 +164,7 @@ mt76x2_tssi_enabled(struct mt76x2_dev *dev)
{
return !mt76x2_temp_tx_alc_enabled(dev) &&
(mt76x2_eeprom_get(dev, MT_EE_NIC_CONF_1) &
MT_EE_NIC_CONF_1_TX_ALC_EN);
MT_EE_NIC_CONF_1_TX_ALC_EN);
}

static inline bool
Expand Down
3 changes: 2 additions & 1 deletion mt76x2_mac.c
Expand Up @@ -325,7 +325,8 @@ mt76x2_mac_process_tx_rate(struct ieee80211_tx_rate *txrate, u16 rate,
}

static void
mt76x2_mac_fill_tx_status(struct mt76x2_dev *dev, struct ieee80211_tx_info *info,
mt76x2_mac_fill_tx_status(struct mt76x2_dev *dev,
struct ieee80211_tx_info *info,
struct mt76x2_tx_status *st, int n_frames)
{
struct ieee80211_tx_rate *rate = info->status.rates;
Expand Down
2 changes: 1 addition & 1 deletion mt76x2_mac.h
Expand Up @@ -175,7 +175,7 @@ void mt76x2_mac_wcid_set_rate(struct mt76x2_dev *dev, struct mt76_wcid *wcid,
const struct ieee80211_tx_rate *rate);

int mt76x2_mac_shared_key_setup(struct mt76x2_dev *dev, u8 vif_idx, u8 key_idx,
struct ieee80211_key_conf *key);
struct ieee80211_key_conf *key);

int mt76x2_mac_set_beacon(struct mt76x2_dev *dev, u8 vif_idx,
struct sk_buff *skb);
Expand Down
2 changes: 1 addition & 1 deletion mt76x2_mcu.c
Expand Up @@ -150,7 +150,7 @@ mt76pci_load_rom_patch(struct mt76x2_dev *dev)

if (!fw || !fw->data || fw->size <= sizeof(*hdr)) {
ret = -EIO;
printk("Failed to load firmware\n");
dev_err(dev->mt76.dev, "Failed to load firmware\n");
goto out;
}

Expand Down

0 comments on commit becce8b

Please sign in to comment.