Merge remote-tracking branch 'lightnvm/for-next'

[deliverable/linux.git] / drivers / net / wireless / mediatek / mt7601u / init.c

diff --git a/drivers/net/wireless/mediatek/mt7601u/init.c b/drivers/net/wireless/mediatek/mt7601u/init.c
index 8fa78d7156bebc9efc5c5050cd750991967e83e9..44d46e25db80ba6bd4aa70d387d1de404f2559c4 100644 (file)
--- a/drivers/net/wireless/mediatek/mt7601u/init.c
+++ b/drivers/net/wireless/mediatek/mt7601u/init.c
@@ -108,8 +108,9 @@ static void mt7601u_init_usb_dma(struct mt7601u_dev *dev)
 {
        u32 val;
 
-       val = MT76_SET(MT_USB_DMA_CFG_RX_BULK_AGG_TOUT, MT_USB_AGGR_TIMEOUT) |
-             MT76_SET(MT_USB_DMA_CFG_RX_BULK_AGG_LMT, MT_USB_AGGR_SIZE_LIMIT) |
+       val = FIELD_PREP(MT_USB_DMA_CFG_RX_BULK_AGG_TOUT, MT_USB_AGGR_TIMEOUT) |
+             FIELD_PREP(MT_USB_DMA_CFG_RX_BULK_AGG_LMT,
+                        MT_USB_AGGR_SIZE_LIMIT) |
              MT_USB_DMA_CFG_RX_BULK_EN |
              MT_USB_DMA_CFG_TX_BULK_EN;
        if (dev->in_max_packet == 512)
@@ -396,8 +397,9 @@ int mt7601u_init_hardware(struct mt7601u_dev *dev)
 
        mt7601u_rmw(dev, MT_US_CYC_CFG, MT_US_CYC_CNT, 0x1e);
 
-       mt7601u_wr(dev, MT_TXOP_CTRL_CFG, MT76_SET(MT_TXOP_TRUN_EN, 0x3f) |
-                                         MT76_SET(MT_TXOP_EXT_CCA_DLY, 0x58));
+       mt7601u_wr(dev, MT_TXOP_CTRL_CFG,
+                  FIELD_PREP(MT_TXOP_TRUN_EN, 0x3f) |
+                  FIELD_PREP(MT_TXOP_EXT_CCA_DLY, 0x58));
 
        ret = mt7601u_eeprom_init(dev);
        if (ret)