Commit ed85f705 authored by Asai Thambi SP's avatar Asai Thambi SP Committed by Ben Hutchings

mtip32xx: Remove unwanted code from taskfile error handler

commit e35b9473 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: default avatarSelvan Mani <smani@micron.com>
Signed-off-by: default avatarRajesh Kumar Sambandam <rsambandam@micron.com>
Signed-off-by: default avatarAsai Thambi S P <asamymuthupa@micron.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
[bwh: Backported to 3.16: adjust context]
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent 4067ffd3
...@@ -621,8 +621,6 @@ static void mtip_handle_tfe(struct driver_data *dd) ...@@ -621,8 +621,6 @@ static void mtip_handle_tfe(struct driver_data *dd)
port = dd->port; port = dd->port;
set_bit(MTIP_PF_EH_ACTIVE_BIT, &port->flags);
if (test_bit(MTIP_PF_IC_ACTIVE_BIT, &port->flags) && if (test_bit(MTIP_PF_IC_ACTIVE_BIT, &port->flags) &&
test_bit(MTIP_TAG_INTERNAL, port->allocated)) { test_bit(MTIP_TAG_INTERNAL, port->allocated)) {
cmd = mtip_cmd_from_tag(dd, MTIP_TAG_INTERNAL); cmd = mtip_cmd_from_tag(dd, MTIP_TAG_INTERNAL);
...@@ -632,7 +630,7 @@ static void mtip_handle_tfe(struct driver_data *dd) ...@@ -632,7 +630,7 @@ static void mtip_handle_tfe(struct driver_data *dd)
cmd->comp_func(port, MTIP_TAG_INTERNAL, cmd->comp_func(port, MTIP_TAG_INTERNAL,
cmd, PORT_IRQ_TF_ERR); cmd, PORT_IRQ_TF_ERR);
} }
goto handle_tfe_exit; return;
} }
/* clear the tag accumulator */ /* clear the tag accumulator */
...@@ -775,11 +773,6 @@ static void mtip_handle_tfe(struct driver_data *dd) ...@@ -775,11 +773,6 @@ static void mtip_handle_tfe(struct driver_data *dd)
} }
} }
print_tags(dd, "reissued (TFE)", tagaccum, cmd_cnt); 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);
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment