diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-06-03 20:21:43 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-06-03 20:21:43 +0300 |
| commit | 72fbbc3d0e3e3117c29a73d0b4d928dc00ed99ce (patch) | |
| tree | 7b786dde386ed70c3930de6356e6fd406f2db36e /drivers/block | |
| parent | 34845d92bca527b5c2cf8b2293b71b9c746c79ca (diff) | |
| parent | e2e530867245d051dc7800b0d07193b3e581f5b9 (diff) | |
| download | linux-72fbbc3d0e3e3117c29a73d0b4d928dc00ed99ce.tar.xz | |
Merge tag 'for-5.19/block-exec-2022-06-02' of git://git.kernel.dk/linux-block
Pull block request execute cleanups from Jens Axboe:
"This change was advertised in the initial core block pull request, but
didn't actually make that branch as we deferred it to a post-merge
pull request to avoid a bunch of cross branch issues.
This series cleans up the block execute path quite nicely"
* tag 'for-5.19/block-exec-2022-06-02' of git://git.kernel.dk/linux-block:
blk-mq: remove the done argument to blk_execute_rq_nowait
blk-mq: avoid a mess of casts for blk_end_sync_rq
blk-mq: remove __blk_execute_rq_nowait
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/sx8.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/sx8.c b/drivers/block/sx8.c index b361583944b9..63b4f6431d2e 100644 --- a/drivers/block/sx8.c +++ b/drivers/block/sx8.c @@ -540,7 +540,7 @@ static int carm_array_info (struct carm_host *host, unsigned int array_idx) spin_unlock_irq(&host->lock); DPRINTK("blk_execute_rq_nowait, tag == %u\n", rq->tag); - blk_execute_rq_nowait(rq, true, NULL); + blk_execute_rq_nowait(rq, true); return 0; @@ -579,7 +579,7 @@ static int carm_send_special (struct carm_host *host, carm_sspc_t func) crq->msg_bucket = (u32) rc; DPRINTK("blk_execute_rq_nowait, tag == %u\n", rq->tag); - blk_execute_rq_nowait(rq, true, NULL); + blk_execute_rq_nowait(rq, true); return 0; } |