lkml.org 
[lkml]   [2016]   [Mar]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.2.y-ckt 065/218] mtip32xx: Remove unwanted code from taskfile error handler
    Date
    4.2.8-ckt7 -stable review patch.  If anyone has any objections, please let me know.

    ---8<------------------------------------------------------------

    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: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/block/mtip32xx/mtip32xx.c | 9 +--------
    1 file changed, 1 insertion(+), 8 deletions(-)

    diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c
    index 4e772dc..2b432f1 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);
    }

    /*
    --
    2.7.4
    \
     
     \ /
      Last update: 2016-03-31 23:41    [W:5.025 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site