summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Corbet <corbet@lwn.net>2019-01-09 21:59:32 +0100
committerJens Axboe <axboe@kernel.dk>2019-01-09 23:29:08 +0100
commit649d4968860ba708636ad643bd52b28027367042 (patch)
tree77d6118ee70afc4931279e86d666cb09564fc529
parentblock: doc: add slice_idle_us to bfq documentation (diff)
downloadlinux-649d4968860ba708636ad643bd52b28027367042.tar.xz
linux-649d4968860ba708636ad643bd52b28027367042.zip
block: fix kerneldoc comment for blk_attempt_plug_merge()
Commit 5f0ed774ed29 ("block: sum requests in the plug structure") removed the request_count parameter from block_attempt_plug_merge(), but did not remove the associated kerneldoc comment, introducing this warning to the docs build: ./block/blk-core.c:685: warning: Excess function parameter 'request_count' description in 'blk_attempt_plug_merge' Remove the obsolete description and make things a little quieter. Signed-off-by: Jonathan Corbet <corbet@lwn.net> Signed-off-by: Jens Axboe <axboe@kernel.dk>
-rw-r--r--block/blk-core.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/block/blk-core.c b/block/blk-core.c
index f2732f106a2e..3c5f61ceeb67 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -661,7 +661,6 @@ no_merge:
* blk_attempt_plug_merge - try to merge with %current's plugged list
* @q: request_queue new bio is being queued at
* @bio: new bio being queued
- * @request_count: out parameter for number of traversed plugged requests
* @same_queue_rq: pointer to &struct request that gets filled in when
* another request associated with @q is found on the plug list
* (optional, may be %NULL)