mt76: use mt76_poll_msec routine in mt76pci_load_firmware()

Use mt76_poll_msec() in mt76pci_load_firmware to check if the firmware
has been started instead of explicitly poll MCU running register

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/mt76x2_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76x2_mcu.c
index 15820b11f9db2ac1902d0be2649dec1e464eecd0..dfd36d736b06f4c48b5e39c902faadc3641b8ebc 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2_mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2_mcu.c
@@ -187,7 +187,7 @@ mt76pci_load_firmware(struct mt76x2_dev *dev)
 {
        const struct firmware *fw;
        const struct mt76x2_fw_header *hdr;
-       int i, len, ret;
+       int len, ret;
        __le32 *cur;
        u32 offset, val;
 
@@ -240,16 +240,7 @@ mt76pci_load_firmware(struct mt76x2_dev *dev)
 
        /* trigger firmware */
        mt76_wr(dev, MT_MCU_INT_LEVEL, 2);
-       for (i = 200; i > 0; i--) {
-               val = mt76_rr(dev, MT_MCU_COM_REG0);
-
-               if (val & 1)
-                       break;
-
-               msleep(10);
-       }
-
-       if (!i) {
+       if (!mt76_poll_msec(dev, MT_MCU_COM_REG0, 1, 1, 200)) {
                dev_err(dev->mt76.dev, "Firmware failed to start\n");
                release_firmware(fw);
                return -ETIMEDOUT;