mtip32xx: Remove unwanted code from taskfile error handler

commit e35b94738a2f7caa12017f69ef385cb6b8028965 upstream.

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>
Signed-off-by: Jens Axboe <axboe@fb.com>
[bwh: Backported to 3.16: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c
index ad109a99dce3b73cce53c5ee3861d626d80b408c..ff210d7a3a0e7bd9e755e1f290f12365453b08c6 100644 (file)
--- a/drivers/block/mtip32xx/mtip32xx.c
+++ b/drivers/block/mtip32xx/mtip32xx.c
@@ -621,8 +621,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) &&
                        test_bit(MTIP_TAG_INTERNAL, port->allocated)) {
                cmd = mtip_cmd_from_tag(dd, MTIP_TAG_INTERNAL);
@@ -632,7 +630,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 */
@@ -775,11 +773,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);
 }
 
 /*