nvme: merge nvme_abort_req and nvme_timeout
authorChristoph Hellwig <hch@lst.de>
Thu, 22 Oct 2015 12:03:35 +0000 (14:03 +0200)
committerJens Axboe <axboe@fb.com>
Tue, 22 Dec 2015 16:38:33 +0000 (09:38 -0700)
commit31c7c7d2c9f17dc98a98c59c17e184bf164ee760
tree658e3a50b133a92780d4c5b662773e6f7145cfd5
parent4c9f748f0ee88447b28546991f60f43a7319aafd
nvme: merge nvme_abort_req and nvme_timeout

We want to be able to return bettern error values frmo nvme_timeout, which
is significantly easier if the two functions are merged.  Also clean up and
reduce the printk spew so that we only get one message per abort.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
drivers/nvme/host/pci.c