mt76x0: remove mt76x0_vendor_reset routine

Remove mt76x0_vendor_reset duplicated routine and use mt76u_mcu_fw_reset
utility function for mcu fw reset

Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/mcu.c b/drivers/net/wireless/mediatek/mt76/mt76x0/mcu.c
index 75768ebf8b307854e622f0bb4df84e03acf4695e..c8ea3126e7dc176f349160cdceacb0d15ad49b07 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/mcu.c
@@ -571,7 +571,7 @@ static int mt76x0_load_firmware(struct mt76x0_dev *dev)
        mt76_set(dev, MT_USB_DMA_CFG, (MT_USB_DMA_CFG_RX_BULK_EN |
                                       MT_USB_DMA_CFG_TX_BULK_EN) |
                                       FIELD_PREP(MT_USB_DMA_CFG_RX_BULK_AGG_TOUT, 0x20));
-       mt76x0_vendor_reset(dev);
+       mt76u_mcu_fw_reset(&dev->mt76);
        msleep(5);
 /*
        mt76x0_rmw(dev, MT_PBF_CFG, 0, (MT_PBF_CFG_TX0Q_EN |

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c b/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c
index 533409c44ec6119dfd050d0fbb876703b97f0989..a0052ef3626673343fabdfac5fa3e29398c3faaf 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c
@@ -131,12 +131,6 @@ int mt76x0_vendor_request(struct mt76x0_dev *dev, const u8 req,
        return ret;
 }
 
-void mt76x0_vendor_reset(struct mt76x0_dev *dev)
-{
-       mt76x0_vendor_request(dev, MT_VEND_DEV_MODE, USB_DIR_OUT,
-                             MT_VEND_DEV_MODE_RESET, 0, NULL, 0);
-}
-
 int mt76x0_vendor_single_wr(struct mt76x0_dev *dev, const u8 req,
                             const u16 offset, const u32 val)
 {

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/usb.h b/drivers/net/wireless/mediatek/mt76/mt76x0/usb.h
index 492e431390a8707867a30c87727ba735497232b3..d23ca45a294eea2b6503a87537a96897d7ff2450 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/usb.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/usb.h
@@ -54,7 +54,6 @@ void mt76x0_complete_urb(struct urb *urb);
 int mt76x0_vendor_request(struct mt76x0_dev *dev, const u8 req,
                           const u8 direction, const u16 val, const u16 offset,
                           void *buf, const size_t buflen);
-void mt76x0_vendor_reset(struct mt76x0_dev *dev);
 int mt76x0_vendor_single_wr(struct mt76x0_dev *dev, const u8 req,
                             const u16 offset, const u32 val);