OSDN Git Service

skd: Remove dead code
authorBart Van Assche <bart.vanassche@wdc.com>
Thu, 17 Aug 2017 20:13:24 +0000 (13:13 -0700)
committerJens Axboe <axboe@kernel.dk>
Fri, 18 Aug 2017 14:45:29 +0000 (08:45 -0600)
Removing the SG IO code also removed the code that sets
SKD_REQ_STATE_ABORTED. Hence also remove the code that checks for
this state.

Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Hannes Reinecke <hare@suse.de>
Cc: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/block/skd_main.c

index 13d0659..c7f531e 100644 (file)
@@ -152,7 +152,6 @@ enum skd_req_state {
        SKD_REQ_STATE_BUSY,
        SKD_REQ_STATE_COMPLETED,
        SKD_REQ_STATE_TIMEOUT,
-       SKD_REQ_STATE_ABORTED,
 };
 
 enum skd_fit_msg_state {
@@ -1734,15 +1733,6 @@ static int skd_isr_completion_posted(struct skd_device *skdev,
 
                SKD_ASSERT(skreq->state == SKD_REQ_STATE_BUSY);
 
-               if (skreq->state == SKD_REQ_STATE_ABORTED) {
-                       dev_dbg(&skdev->pdev->dev, "reclaim req %p id=%04x\n",
-                               skreq, skreq->id);
-                       /* a previously timed out command can
-                        * now be cleaned up */
-                       skd_release_skreq(skdev, skreq);
-                       continue;
-               }
-
                skreq->completion = *skcmp;
                if (unlikely(cmp_status == SAM_STAT_CHECK_CONDITION)) {
                        skreq->err_info = *skerr;
@@ -3823,8 +3813,6 @@ static const char *skd_skreq_state_to_str(enum skd_req_state state)
                return "COMPLETED";
        case SKD_REQ_STATE_TIMEOUT:
                return "TIMEOUT";
-       case SKD_REQ_STATE_ABORTED:
-               return "ABORTED";
        default:
                return "???";
        }