diff options
author | weiping zhang <zhangweiping@didichuxing.com> | 2017-08-24 13:11:33 -0400 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2017-08-28 12:01:08 -0400 |
commit | 235f8da119351ae583abfbbf577eb61a8b564203 (patch) | |
tree | bd6c28a7d55348202b1820ce8720aac567293f84 /block/mq-deadline.c | |
parent | f5cb2d51524a1218bb0c5d8b234044e9104f7062 (diff) |
block, scheduler: convert xxx_var_store to void
The last parameter "count" never be used in xxx_var_store,
convert these functions to void.
Signed-off-by: weiping zhang <zhangweiping@didichuxing.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/mq-deadline.c')
-rw-r--r-- | block/mq-deadline.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/block/mq-deadline.c b/block/mq-deadline.c index 1b964a387afe..c8dfddc4ba8b 100644 --- a/block/mq-deadline.c +++ b/block/mq-deadline.c | |||
@@ -457,13 +457,12 @@ deadline_var_show(int var, char *page) | |||
457 | return sprintf(page, "%d\n", var); | 457 | return sprintf(page, "%d\n", var); |
458 | } | 458 | } |
459 | 459 | ||
460 | static ssize_t | 460 | static void |
461 | deadline_var_store(int *var, const char *page, size_t count) | 461 | deadline_var_store(int *var, const char *page) |
462 | { | 462 | { |
463 | char *p = (char *) page; | 463 | char *p = (char *) page; |
464 | 464 | ||
465 | *var = simple_strtol(p, &p, 10); | 465 | *var = simple_strtol(p, &p, 10); |
466 | return count; | ||
467 | } | 466 | } |
468 | 467 | ||
469 | #define SHOW_FUNCTION(__FUNC, __VAR, __CONV) \ | 468 | #define SHOW_FUNCTION(__FUNC, __VAR, __CONV) \ |
@@ -487,7 +486,7 @@ static ssize_t __FUNC(struct elevator_queue *e, const char *page, size_t count) | |||
487 | { \ | 486 | { \ |
488 | struct deadline_data *dd = e->elevator_data; \ | 487 | struct deadline_data *dd = e->elevator_data; \ |
489 | int __data; \ | 488 | int __data; \ |
490 | int ret = deadline_var_store(&__data, (page), count); \ | 489 | deadline_var_store(&__data, (page)); \ |
491 | if (__data < (MIN)) \ | 490 | if (__data < (MIN)) \ |
492 | __data = (MIN); \ | 491 | __data = (MIN); \ |
493 | else if (__data > (MAX)) \ | 492 | else if (__data > (MAX)) \ |
@@ -496,7 +495,7 @@ static ssize_t __FUNC(struct elevator_queue *e, const char *page, size_t count) | |||
496 | *(__PTR) = msecs_to_jiffies(__data); \ | 495 | *(__PTR) = msecs_to_jiffies(__data); \ |
497 | else \ | 496 | else \ |
498 | *(__PTR) = __data; \ | 497 | *(__PTR) = __data; \ |
499 | return ret; \ | 498 | return count; \ |
500 | } | 499 | } |
501 | STORE_FUNCTION(deadline_read_expire_store, &dd->fifo_expire[READ], 0, INT_MAX, 1); | 500 | STORE_FUNCTION(deadline_read_expire_store, &dd->fifo_expire[READ], 0, INT_MAX, 1); |
502 | STORE_FUNCTION(deadline_write_expire_store, &dd->fifo_expire[WRITE], 0, INT_MAX, 1); | 501 | STORE_FUNCTION(deadline_write_expire_store, &dd->fifo_expire[WRITE], 0, INT_MAX, 1); |