diff --git a/mt7603/mac.c b/mt7603/mac.c
index b731f24..e1f9810 100644
--- a/mt7603/mac.c
+++ b/mt7603/mac.c
@@ -234,11 +234,10 @@ void mt7603_wtbl_set_smps(struct mt7603_dev *dev, struct mt7603_sta *sta,
 		return;
 
 	num_retries = 3;
-	do
-	{
+	do {
 		mt76_rmw_field(dev, addr, MT_WTBL1_W2_SMPS, enabled);
 		successful = mt76_poll(dev, addr, MT_WTBL1_W2_SMPS,
-								enabled, 15000);
+				       enabled, 15000);
 	} while (!successful && --num_retries);
 
 	if (successful)
diff --git a/mt76x02_eeprom.c b/mt76x02_eeprom.c
index c0227b2..76e7edc 100644
--- a/mt76x02_eeprom.c
+++ b/mt76x02_eeprom.c
@@ -47,7 +47,7 @@ int mt76x02_eeprom_copy(struct mt76x02_dev *dev,
 			void *dest, int len)
 {
 	if (field + len > dev->mt76.eeprom.size)
-		return -1;
+		return -EINVAL;
 
 	memcpy(dest, dev->mt76.eeprom.data + field, len);
 	return 0;
diff --git a/mt76x02_eeprom.h b/mt76x02_eeprom.h
index 13fa708..4c328ff 100644
--- a/mt76x02_eeprom.h
+++ b/mt76x02_eeprom.h
@@ -140,7 +140,7 @@ mt76x02_sign_extend(u32 val, unsigned int size)
 
 	val &= BIT(size - 1) - 1;
 
-	return sign ? val : -val;
+	return sign ? -val : val;
 }
 
 static inline int
diff --git a/mt76x02_mmio.c b/mt76x02_mmio.c
index 68d80b7..984928e 100644
--- a/mt76x02_mmio.c
+++ b/mt76x02_mmio.c
@@ -461,8 +461,9 @@ static void mt76x02_reset_state(struct mt76x02_dev *dev)
 static bool dma_is_busy(struct mt76x02_dev *dev)
 {
 	u32 dma_status = mt76_rr(dev, MT_WPDMA_GLO_CFG);
-    return dma_status & (MT_WPDMA_GLO_CFG_TX_DMA_EN |
-		MT_WPDMA_GLO_CFG_RX_DMA_EN);
+
+	return dma_status & (MT_WPDMA_GLO_CFG_TX_DMA_EN |
+			     MT_WPDMA_GLO_CFG_RX_DMA_EN);
 }
 
 static void mt76x02_watchdog_reset(struct mt76x02_dev *dev)
@@ -519,7 +520,7 @@ static void mt76x02_watchdog_reset(struct mt76x02_dev *dev)
 
 	if (restart) {
 		int retry = 5;
-		while (--retry != 0 && dma_is_busy(dev)) {
+		while (retry-- > 0 && dma_is_busy(dev)) {
 			usleep_range(5000, 10000);
 		}
 		mt76_mcu_restart(dev);
diff --git a/mt76x02_phy.c b/mt76x02_phy.c
index f98ba3d..d1f7aee 100644
--- a/mt76x02_phy.c
+++ b/mt76x02_phy.c
@@ -64,7 +64,7 @@ int mt76x02_get_max_rate_power(struct mt76x02_rate_power *r)
 	s8 ret = 0;
 	int i;
 
-	for (i = 0; i < sizeof(r->all); i++)
+	for (i = 0; i < ARRAY_SIZE(r->all); i++)
 		ret = max(ret, r->all[i]);
 
 	return ret;
@@ -75,7 +75,7 @@ void mt76x02_limit_rate_power(struct mt76x02_rate_power *r, int limit)
 {
 	int i;
 
-	for (i = 0; i < sizeof(r->all); i++)
+	for (i = 0; i < ARRAY_SIZE(r->all); i++)
 		if (r->all[i] > limit)
 			r->all[i] = limit;
 }
@@ -85,7 +85,7 @@ void mt76x02_add_rate_power_offset(struct mt76x02_rate_power *r, int offset)
 {
 	int i;
 
-	for (i = 0; i < sizeof(r->all); i++)
+	for (i = 0; i < ARRAY_SIZE(r->all); i++)
 		r->all[i] += offset;
 }
 EXPORT_SYMBOL_GPL(mt76x02_add_rate_power_offset);
diff --git a/mt76x02_txrx.c b/mt76x02_txrx.c
index 913b5f6..f28fb32 100644
--- a/mt76x02_txrx.c
+++ b/mt76x02_txrx.c
@@ -68,10 +68,10 @@ s8 mt76x02_tx_get_max_txpwr_adj(struct mt76x02_dev *dev,
 
 			nss = ieee80211_rate_get_vht_nss(rate);
 			idx = ((nss - 1) << 3) + mcs;
-			max_txpwr =dev->rate_power.ht[idx & 0xf];
+			max_txpwr = dev->rate_power.ht[idx & 0xf];
 		}
 	} else if (rate->flags & IEEE80211_TX_RC_MCS) {
-		max_txpwr =dev->rate_power.ht[rate->idx & 0xf];
+		max_txpwr = dev->rate_power.ht[rate->idx & 0xf];
 	} else {
 		enum nl80211_band band = dev->mphy.chandef.chan->band;
 
@@ -86,7 +86,7 @@ s8 mt76x02_tx_get_max_txpwr_adj(struct mt76x02_dev *dev,
 			else
 				max_txpwr = rp->ofdm[r->hw_value & 0x7];
 		} else {
-			max_txpwr =dev->rate_power.ofdm[rate->idx & 0x7];
+			max_txpwr = dev->rate_power.ofdm[rate->idx & 0x7];
 		}
 	}