From becce8bd46de77201fdf2ef820c40ecce83ff114 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Mon, 5 Sep 2016 10:08:16 +0200 Subject: [PATCH] mt76x2: fix more checkpatch errors Signed-off-by: Felix Fietkau --- mt76x2_eeprom.c | 8 +++++--- mt76x2_eeprom.h | 2 +- mt76x2_mac.c | 3 ++- mt76x2_mac.h | 2 +- mt76x2_mcu.c | 2 +- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/mt76x2_eeprom.c b/mt76x2_eeprom.c index e6fece8e9..925fe6ae1 100644 --- a/mt76x2_eeprom.c +++ b/mt76x2_eeprom.c @@ -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: @@ -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); @@ -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); @@ -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; diff --git a/mt76x2_eeprom.h b/mt76x2_eeprom.h index c5e001ef7..bbd7a5b11 100644 --- a/mt76x2_eeprom.h +++ b/mt76x2_eeprom.h @@ -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 diff --git a/mt76x2_mac.c b/mt76x2_mac.c index 7e62f589a..ab43f885c 100644 --- a/mt76x2_mac.c +++ b/mt76x2_mac.c @@ -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; diff --git a/mt76x2_mac.h b/mt76x2_mac.h index d6eead1d9..301288094 100644 --- a/mt76x2_mac.h +++ b/mt76x2_mac.h @@ -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); diff --git a/mt76x2_mcu.c b/mt76x2_mcu.c index 71108bb4f..4c94f8464 100644 --- a/mt76x2_mcu.c +++ b/mt76x2_mcu.c @@ -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; }