Skip to contentSkip to conversation

block: fix kerneldoc comment for blk_attempt_plug_merge()

PATCH Applied Jonathan Corbet 2 participants 2 messages Jan 9, 2019 Block layer

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 block/blk-core.c | 1 -
 1 file changed, 1 deletion(-)
block/blk-core.c +0 -1
index c78042975737..eba494f528cb 100644
@@ -661,7 +661,6 @@ bool bio_attempt_discard_merge(struct request_queue *q, struct request *req,
  * 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)
Signature · 1 line
2.20.1
maintainer Applied
#1 lore raw
Quoted 8 lines · Jonathan Corbet

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.

Applied, thanks Jon.

Signature · 1 line
Jens Axboe