wifi: wilc1000: remove use of has_thrpt_enh3 flag

The 'enhance throughput flow' algorithm is used by default. So older
sections of the code are removed so as to always use this new algorithm.

Signed-off-by: Prasurjya Rohan Saikia <prasurjya.rohansaikia@microchip.com>
Acked-by: Ajay Kathat <ajay.kathat@microchip.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20230710094401.235222-1-prasurjya.rohansaikia@microchip.com

diff --git a/drivers/net/wireless/microchip/wilc1000/sdio.c b/drivers/net/wireless/microchip/wilc1000/sdio.c
index a05bda7b9a3ba52b71624e7d0515121b57f5e8b5..87948ba69a222f374b05f28662f5ef5214519805 100644 (file)
--- a/drivers/net/wireless/microchip/wilc1000/sdio.c
+++ b/drivers/net/wireless/microchip/wilc1000/sdio.c
@@ -28,7 +28,6 @@ struct wilc_sdio {
        bool irq_gpio;
        u32 block_size;
        bool isinit;
-       int has_thrpt_enh3;
        u8 *cmd53_buf;
 };
 
@@ -722,21 +721,12 @@ static int wilc_sdio_init(struct wilc *wilc, bool resume)
         *      make sure can read back chip id correctly
         **/
        if (!resume) {
-               int rev;
-
                ret = wilc_sdio_read_reg(wilc, WILC_CHIPID, &chipid);
                if (ret) {
                        dev_err(&func->dev, "Fail cmd read chip id...\n");
                        return ret;
                }
                dev_err(&func->dev, "chipid (%08x)\n", chipid);
-               rev = FIELD_GET(WILC_CHIP_REV_FIELD, chipid);
-               if (rev > FIELD_GET(WILC_CHIP_REV_FIELD, WILC_1000_BASE_ID_2A))
-                       sdio_priv->has_thrpt_enh3 = 1;
-               else
-                       sdio_priv->has_thrpt_enh3 = 0;
-               dev_info(&func->dev, "has_thrpt_enh3 = %d...\n",
-                        sdio_priv->has_thrpt_enh3);
        }
 
        sdio_priv->isinit = true;
@@ -809,102 +799,29 @@ static int wilc_sdio_clear_int_ext(struct wilc *wilc, u32 val)
        struct sdio_func *func = dev_to_sdio_func(wilc->dev);
        struct wilc_sdio *sdio_priv = wilc->bus_data;
        int ret;
-       int vmm_ctl;
-
-       if (sdio_priv->has_thrpt_enh3) {
-               u32 reg = 0;
-
-               if (sdio_priv->irq_gpio)
-                       reg = val & (BIT(MAX_NUM_INT) - 1);
-
-               /* select VMM table 0 */
-               if (val & SEL_VMM_TBL0)
-                       reg |= BIT(5);
-               /* select VMM table 1 */
-               if (val & SEL_VMM_TBL1)
-                       reg |= BIT(6);
-               /* enable VMM */
-               if (val & EN_VMM)
-                       reg |= BIT(7);
-               if (reg) {
-                       struct sdio_cmd52 cmd;
-
-                       cmd.read_write = 1;
-                       cmd.function = 0;
-                       cmd.raw = 0;
-                       cmd.address = WILC_SDIO_IRQ_CLEAR_FLAG_REG;
-                       cmd.data = reg;
-
-                       ret = wilc_sdio_cmd52(wilc, &cmd);
-                       if (ret) {
-                               dev_err(&func->dev,
-                                       "Failed cmd52, set (%02x) data (%d) ...\n",
-                                       cmd.address, __LINE__);
-                               return ret;
-                       }
-               }
-               return 0;
-       }
-       if (sdio_priv->irq_gpio) {
-               /* has_thrpt_enh2 uses register 0xf8 to clear interrupts. */
-               /*
-                * Cannot clear multiple interrupts.
-                * Must clear each interrupt individually.
-                */
-               u32 flags;
-               int i;
-
-               flags = val & (BIT(MAX_NUM_INT) - 1);
-               for (i = 0; i < NUM_INT_EXT && flags; i++) {
-                       if (flags & BIT(i)) {
-                               struct sdio_cmd52 cmd;
-
-                               cmd.read_write = 1;
-                               cmd.function = 0;
-                               cmd.raw = 0;
-                               cmd.address = WILC_SDIO_IRQ_CLEAR_FLAG_REG;
-                               cmd.data = BIT(i);
-
-                               ret = wilc_sdio_cmd52(wilc, &cmd);
-                               if (ret) {
-                                       dev_err(&func->dev,
-                                               "Failed cmd52, set (%02x) data (%d) ...\n",
-                                               cmd.address, __LINE__);
-                                       return ret;
-                               }
-                               flags &= ~BIT(i);
-                       }
-               }
+       u32 reg = 0;
 
-               for (i = NUM_INT_EXT; i < MAX_NUM_INT && flags; i++) {
-                       if (flags & BIT(i)) {
-                               dev_err(&func->dev,
-                                       "Unexpected interrupt cleared %d...\n",
-                                       i);
-                               flags &= ~BIT(i);
-                       }
-               }
-       }
+       if (sdio_priv->irq_gpio)
+               reg = val & (BIT(MAX_NUM_INT) - 1);
 
-       vmm_ctl = 0;
        /* select VMM table 0 */
        if (val & SEL_VMM_TBL0)
-               vmm_ctl |= BIT(0);
+               reg |= BIT(5);
        /* select VMM table 1 */
        if (val & SEL_VMM_TBL1)
-               vmm_ctl |= BIT(1);
+               reg |= BIT(6);
        /* enable VMM */
        if (val & EN_VMM)
-               vmm_ctl |= BIT(2);
-
-       if (vmm_ctl) {
+               reg |= BIT(7);
+       if (reg) {
                struct sdio_cmd52 cmd;
 
                cmd.read_write = 1;
                cmd.function = 0;
                cmd.raw = 0;
-               cmd.address = WILC_SDIO_VMM_TBL_CTRL_REG;
-               cmd.data = vmm_ctl;
+               cmd.address = WILC_SDIO_IRQ_CLEAR_FLAG_REG;
+               cmd.data = reg;
+
                ret = wilc_sdio_cmd52(wilc, &cmd);
                if (ret) {
                        dev_err(&func->dev,