diff options
| author | Asai Thambi SP <asamymuthupa@micron.com> | 2016-02-24 21:16:21 -0800 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2016-03-03 09:08:43 -0700 |
| commit | e35b94738a2f7caa12017f69ef385cb6b8028965 (patch) | |
| tree | c73443a92e9471ccce9acd9a51483df0b4119986 /drivers/block | |
| parent | cfc05bd31384c4898bf2437a4de5557f3cf9803a (diff) | |
| download | linux-stable-e35b94738a2f7caa12017f69ef385cb6b8028965.tar.gz linux-stable-e35b94738a2f7caa12017f69ef385cb6b8028965.tar.bz2 linux-stable-e35b94738a2f7caa12017f69ef385cb6b8028965.zip | |
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>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/mtip32xx/mtip32xx.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c index dc445b4fc00f..be9ad9ca4fe1 100644 --- 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); } /* |