| From e35b94738a2f7caa12017f69ef385cb6b8028965 Mon Sep 17 00:00:00 2001 |
| From: Asai Thambi SP <asamymuthupa@micron.com> |
| Date: Wed, 24 Feb 2016 21:16:21 -0800 |
| Subject: mtip32xx: Remove unwanted code from taskfile error handler |
| |
| From: Asai Thambi SP <asamymuthupa@micron.com> |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/block/mtip32xx/mtip32xx.c | 9 +-------- |
| 1 file changed, 1 insertion(+), 8 deletions(-) |
| |
| --- a/drivers/block/mtip32xx/mtip32xx.c |
| +++ b/drivers/block/mtip32xx/mtip32xx.c |
| @@ -618,8 +618,6 @@ static void mtip_handle_tfe(struct drive |
| |
| 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 drive |
| 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 drive |
| } |
| } |
| 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); |
| } |
| |
| /* |
