Skip to contentSkip to conversation

improve mt76 led code readability

PATCH New Lorenzo Bianconi 1 participant 3 messages Dec 16, 2019

Subsystems (2)
Arm MediaTek MediaTek MT76 wireless LAN driver
lore
Share & tools
lore

Lorenzo Bianconi

author maintainer
#0 lore raw

v2 cover improve mt76 led code readability

Improve code readability relying on FIELD_PREP macro for led register definitions and remove open coding

Changes since v1:
- remove _MASK suffix from register definitions and move the code in *_init.c

Lorenzo Bianconi (2):
mt76: mt76x02: simplify led reg definitions
mt76: mt7603: simplify led reg definitions

 drivers/net/wireless/mediatek/mt76/mt7603/init.c  |  6 +++---
 drivers/net/wireless/mediatek/mt76/mt7603/regs.h  | 15 +++------------
 drivers/net/wireless/mediatek/mt76/mt76x02_regs.h | 12 +++---------
 drivers/net/wireless/mediatek/mt76/mt76x02_util.c |  6 +++---
 4 files changed, 12 insertions(+), 27 deletions(-)
Signature · 1 line
2.21.0
author maintainer
#1 lore raw

PATCH v2 1/2 mt76: mt76x02: simplify led reg definitions

Rely on FIELD_PREP macro for led register definitions and remove open coding

Signed-off-by Lorenzo Bianconi <[email protected]>
---
 drivers/net/wireless/mediatek/mt76/mt76x02_regs.h | 12 +++---------
 drivers/net/wireless/mediatek/mt76/mt76x02_util.c |  6 +++---
 2 files changed, 6 insertions(+), 12 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76x02_regs.h +3 -9
index 21c0f351fa09..3e722276b5c2 100644
@@ -235,15 +235,9 @@
 #define MT_LED_S0(_n)			(MT_LED_S0_BASE + 8 * (_n))
 #define MT_LED_S1_BASE			0x0780
 #define MT_LED_S1(_n)			(MT_LED_S1_BASE + 8 * (_n))
-#define MT_LED_STATUS_OFF_MASK		GENMASK(31, 24)
-#define MT_LED_STATUS_OFF(_v)		(((_v) << __ffs(MT_LED_STATUS_OFF_MASK)) & \
-					 MT_LED_STATUS_OFF_MASK)
-#define MT_LED_STATUS_ON_MASK		GENMASK(23, 16)
-#define MT_LED_STATUS_ON(_v)		(((_v) << __ffs(MT_LED_STATUS_ON_MASK)) & \
-					 MT_LED_STATUS_ON_MASK)
-#define MT_LED_STATUS_DURATION_MASK	GENMASK(15, 8)
-#define MT_LED_STATUS_DURATION(_v)	(((_v) << __ffs(MT_LED_STATUS_DURATION_MASK)) & \
-					 MT_LED_STATUS_DURATION_MASK)
+#define MT_LED_STATUS_OFF		GENMASK(31, 24)
+#define MT_LED_STATUS_ON		GENMASK(23, 16)
+#define MT_LED_STATUS_DURATION		GENMASK(15, 8)
 
 #define MT_FCE_PSE_CTRL			0x0800
 #define MT_FCE_PARAMETERS		0x0804
drivers/net/wireless/mediatek/mt76/mt76x02_util.c +3 -3
index ab717d82d771..f5fe3578f058 100644
@@ -96,9 +96,9 @@ mt76x02_led_set_config(struct mt76_dev *mdev, u8 delay_on,
 					       mt76);
 	u32 val;
 
-	val = MT_LED_STATUS_DURATION(0xff) |
-	      MT_LED_STATUS_OFF(delay_off) |
-	      MT_LED_STATUS_ON(delay_on);
+	val = FIELD_PREP(MT_LED_STATUS_DURATION, 0xff) |
+	      FIELD_PREP(MT_LED_STATUS_OFF, delay_off) |
+	      FIELD_PREP(MT_LED_STATUS_ON, delay_on);
 
 	mt76_wr(dev, MT_LED_S0(mdev->led_pin), val);
 	mt76_wr(dev, MT_LED_S1(mdev->led_pin), val);
Signature · 1 line
2.21.0
author maintainer
#2 lore raw

PATCH v2 2/2 mt76: mt7603: simplify led reg definitions

In reply to Lorenzo Bianconi

Rely on FIELD_PREP macro for led register definitions and remove open coding

Signed-off-by Lorenzo Bianconi <[email protected]>
---
 drivers/net/wireless/mediatek/mt76/mt7603/init.c |  6 +++---
 drivers/net/wireless/mediatek/mt76/mt7603/regs.h | 15 +++------------
 2 files changed, 6 insertions(+), 15 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7603/init.c +3 -3
index af346d479258..32fdb81b2bb0 100644
@@ -363,9 +363,9 @@ static void mt7603_led_set_config(struct mt76_dev *mt76, u8 delay_on,
 					      mt76);
 	u32 val, addr;
 
-	val = MT_LED_STATUS_DURATION(0xffff) |
-	      MT_LED_STATUS_OFF(delay_off) |
-	      MT_LED_STATUS_ON(delay_on);
+	val = FIELD_PREP(MT_LED_STATUS_DURATION, 0xffff) |
+	      FIELD_PREP(MT_LED_STATUS_OFF, delay_off) |
+	      FIELD_PREP(MT_LED_STATUS_ON, delay_on);
 
 	addr = mt7603_reg_map(dev, MT_LED_STATUS_0(mt76->led_pin));
 	mt76_wr(dev, addr, val);
drivers/net/wireless/mediatek/mt76/mt7603/regs.h +3 -12
index 6e23ed3dfdff..6741e6907194 100644
@@ -585,18 +585,9 @@ enum {
 
 #define MT_LED_STATUS_0(_n)		MT_LED_PHYS(0x10 + ((_n) * 8))
 #define MT_LED_STATUS_1(_n)		MT_LED_PHYS(0x14 + ((_n) * 8))
-#define MT_LED_STATUS_OFF_MASK		GENMASK(31, 24)
-#define MT_LED_STATUS_OFF(_v)		(((_v) << \
-					  __ffs(MT_LED_STATUS_OFF_MASK)) & \
-					 MT_LED_STATUS_OFF_MASK)
-#define MT_LED_STATUS_ON_MASK		GENMASK(23, 16)
-#define MT_LED_STATUS_ON(_v)		(((_v) << \
-					  __ffs(MT_LED_STATUS_ON_MASK)) & \
-					 MT_LED_STATUS_ON_MASK)
-#define MT_LED_STATUS_DURATION_MASK	GENMASK(15, 0)
-#define MT_LED_STATUS_DURATION(_v)	(((_v) << \
-					  __ffs(MT_LED_STATUS_DURATION_MASK)) &\
-					 MT_LED_STATUS_DURATION_MASK)
+#define MT_LED_STATUS_OFF		GENMASK(31, 24)
+#define MT_LED_STATUS_ON		GENMASK(23, 16)
+#define MT_LED_STATUS_DURATION		GENMASK(15, 0)
 
 #define MT_CLIENT_BASE_PHYS_ADDR	0x800c0000
Signature · 1 line
2.21.0