mtip32xx: Remove unwanted code from taskfile error handler

Remove setting and clearing MTIP_PF_EH_ACTIVE_BIT flag in
mtip_handle_tfe() as they are redundant. Also avoid waking
up service thread from mtip_handle_tfe() because it is
already woken up in case of taskfile error.

Signed-off-by: Selvan Mani <smani@micron.com>
Signed-off-by: Rajesh Kumar Sambandam <rsambandam@micron.com>
Signed-off-by: Asai Thambi S P <asamymuthupa@micron.com>
Cc: stable@vger.kernel.org
Signed-off-by: Jens Axboe <axboe@fb.com>

diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c
index dc445b4fc00fc2f322a67ae92eacede48feddde8..be9ad9ca4fe165cf76eafa8d011f610989937bd8 100644 (file)
--- a/drivers/block/mtip32xx/mtip32xx.c
+++ b/drivers/block/mtip32xx/mtip32xx.c
@@ -618,8 +618,6 @@ static void mtip_handle_tfe(struct driver_data *dd)
 
        port = dd->port;
 
-       set_bit(MTIP_PF_EH_ACTIVE_BIT, &port->flags);
-
        if (test_bit(MTIP_PF_IC_ACTIVE_BIT, &port->flags)) {
                cmd = mtip_cmd_from_tag(dd, MTIP_TAG_INTERNAL);
                dbg_printk(MTIP_DRV_NAME " TFE for the internal command\n");
@@ -628,7 +626,7 @@ static void mtip_handle_tfe(struct driver_data *dd)
                        cmd->comp_func(port, MTIP_TAG_INTERNAL,
                                        cmd, PORT_IRQ_TF_ERR);
                }
-               goto handle_tfe_exit;
+               return;
        }
 
        /* clear the tag accumulator */
@@ -771,11 +769,6 @@ static void mtip_handle_tfe(struct driver_data *dd)
                }
        }
        print_tags(dd, "reissued (TFE)", tagaccum, cmd_cnt);
-
-handle_tfe_exit:
-       /* clear eh_active */
-       clear_bit(MTIP_PF_EH_ACTIVE_BIT, &port->flags);
-       wake_up_interruptible(&port->svc_wait);
 }
 
 /*