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>

diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
index ea2832b..7948446 100644 (file)
--- a/block/bfq-iosched.c
+++ b/block/bfq-iosched.c
@@ -4801,16 +4801,13 @@ static ssize_t bfq_var_show(unsigned int var, char *page)
        return sprintf(page, "%u\n", var);
 }
 
-static ssize_t bfq_var_store(unsigned long *var, const char *page,
-                            size_t count)
+static void bfq_var_store(unsigned long *var, const char *page)
 {
        unsigned long new_val;
        int ret = kstrtoul(page, 10, &new_val);
 
        if (ret == 0)
                *var = new_val;
-
-       return count;
 }
 
 #define SHOW_FUNCTION(__FUNC, __VAR, __CONV)                           \
@@ -4852,7 +4849,7 @@ __FUNC(struct elevator_queue *e, const char *page, size_t count)  \
 {                                                                      \
        struct bfq_data *bfqd = e->elevator_data;                       \
        unsigned long uninitialized_var(__data);                        \
-       int ret = bfq_var_store(&__data, (page), count);                \
+       bfq_var_store(&__data, (page));                                 \
        if (__data < (MIN))                                             \
                __data = (MIN);                                         \
        else if (__data > (MAX))                                        \
@@ -4863,7 +4860,7 @@ __FUNC(struct elevator_queue *e, const char *page, size_t count)  \
                *(__PTR) = (u64)__data * NSEC_PER_MSEC;                 \
        else                                                            \
                *(__PTR) = __data;                                      \
-       return ret;                                                     \
+       return count;                                                   \
 }
 STORE_FUNCTION(bfq_fifo_expire_sync_store, &bfqd->bfq_fifo_expire[1], 1,
                INT_MAX, 2);
@@ -4880,13 +4877,13 @@ static ssize_t __FUNC(struct elevator_queue *e, const char *page, size_t count)\
 {                                                                      \
        struct bfq_data *bfqd = e->elevator_data;                       \
        unsigned long uninitialized_var(__data);                        \
-       int ret = bfq_var_store(&__data, (page), count);                \
+       bfq_var_store(&__data, (page));                                 \
        if (__data < (MIN))                                             \
                __data = (MIN);                                         \
        else if (__data > (MAX))                                        \
                __data = (MAX);                                         \
        *(__PTR) = (u64)__data * NSEC_PER_USEC;                         \
-       return ret;                                                     \
+       return count;                                                   \
 }
 USEC_STORE_FUNCTION(bfq_slice_idle_us_store, &bfqd->bfq_slice_idle, 0,
                    UINT_MAX);
@@ -4897,7 +4894,8 @@ static ssize_t bfq_max_budget_store(struct elevator_queue *e,
 {
        struct bfq_data *bfqd = e->elevator_data;
        unsigned long uninitialized_var(__data);
-       int ret = bfq_var_store(&__data, (page), count);
+
+       bfq_var_store(&__data, (page));
 
        if (__data == 0)
                bfqd->bfq_max_budget = bfq_calc_max_budget(bfqd);
@@ -4909,7 +4907,7 @@ static ssize_t bfq_max_budget_store(struct elevator_queue *e,
 
        bfqd->bfq_user_max_budget = __data;
 
-       return ret;
+       return count;
 }
 
 /*
@@ -4921,7 +4919,8 @@ static ssize_t bfq_timeout_sync_store(struct elevator_queue *e,
 {
        struct bfq_data *bfqd = e->elevator_data;
        unsigned long uninitialized_var(__data);
-       int ret = bfq_var_store(&__data, (page), count);
+
+       bfq_var_store(&__data, (page));
 
        if (__data < 1)
                __data = 1;
@@ -4932,7 +4931,7 @@ static ssize_t bfq_timeout_sync_store(struct elevator_queue *e,
        if (bfqd->bfq_user_max_budget == 0)
                bfqd->bfq_max_budget = bfq_calc_max_budget(bfqd);
 
-       return ret;
+       return count;
 }
 
 static ssize_t bfq_strict_guarantees_store(struct elevator_queue *e,
@@ -4940,7 +4939,8 @@ static ssize_t bfq_strict_guarantees_store(struct elevator_queue *e,
 {
        struct bfq_data *bfqd = e->elevator_data;
        unsigned long uninitialized_var(__data);
-       int ret = bfq_var_store(&__data, (page), count);
+
+       bfq_var_store(&__data, (page));
 
        if (__data > 1)
                __data = 1;
@@ -4950,7 +4950,7 @@ static ssize_t bfq_strict_guarantees_store(struct elevator_queue *e,
 
        bfqd->strict_guarantees = __data;
 
-       return ret;
+       return count;
 }
 
 static ssize_t bfq_low_latency_store(struct elevator_queue *e,
@@ -4958,7 +4958,8 @@ static ssize_t bfq_low_latency_store(struct elevator_queue *e,
 {
        struct bfq_data *bfqd = e->elevator_data;
        unsigned long uninitialized_var(__data);
-       int ret = bfq_var_store(&__data, (page), count);
+
+       bfq_var_store(&__data, (page));
 
        if (__data > 1)
                __data = 1;
@@ -4966,7 +4967,7 @@ static ssize_t bfq_low_latency_store(struct elevator_queue *e,
                bfq_end_wr(bfqd);
        bfqd->low_latency = __data;
 
-       return ret;
+       return count;
 }
 
 #define BFQ_ATTR(name) \

diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 15cad96..9b86e9b 100644 (file)
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -4712,13 +4712,12 @@ cfq_var_show(unsigned int var, char *page)
        return sprintf(page, "%u\n", var);
 }
 
-static ssize_t
-cfq_var_store(unsigned int *var, const char *page, size_t count)
+static void
+cfq_var_store(unsigned int *var, const char *page)
 {
        char *p = (char *) page;
 
        *var = simple_strtoul(p, &p, 10);
-       return count;
 }
 
 #define SHOW_FUNCTION(__FUNC, __VAR, __CONV)                           \
@@ -4764,7 +4763,7 @@ static ssize_t __FUNC(struct elevator_queue *e, const char *page, size_t count)
 {                                                                      \
        struct cfq_data *cfqd = e->elevator_data;                       \
        unsigned int __data;                                            \
-       int ret = cfq_var_store(&__data, (page), count);                \
+       cfq_var_store(&__data, (page));                                 \
        if (__data < (MIN))                                             \
                __data = (MIN);                                         \
        else if (__data > (MAX))                                        \
@@ -4773,7 +4772,7 @@ static ssize_t __FUNC(struct elevator_queue *e, const char *page, size_t count)
                *(__PTR) = (u64)__data * NSEC_PER_MSEC;                 \
        else                                                            \
                *(__PTR) = __data;                                      \
-       return ret;                                                     \
+       return count;                                                   \
 }
 STORE_FUNCTION(cfq_quantum_store, &cfqd->cfq_quantum, 1, UINT_MAX, 0);
 STORE_FUNCTION(cfq_fifo_expire_sync_store, &cfqd->cfq_fifo_expire[1], 1,
@@ -4798,13 +4797,13 @@ static ssize_t __FUNC(struct elevator_queue *e, const char *page, size_t count)
 {                                                                      \
        struct cfq_data *cfqd = e->elevator_data;                       \
        unsigned int __data;                                            \
-       int ret = cfq_var_store(&__data, (page), count);                \
+       cfq_var_store(&__data, (page));                                 \
        if (__data < (MIN))                                             \
                __data = (MIN);                                         \
        else if (__data > (MAX))                                        \
                __data = (MAX);                                         \
        *(__PTR) = (u64)__data * NSEC_PER_USEC;                         \
-       return ret;                                                     \
+       return count;                                                   \
 }
 USEC_STORE_FUNCTION(cfq_slice_idle_us_store, &cfqd->cfq_slice_idle, 0, UINT_MAX);
 USEC_STORE_FUNCTION(cfq_group_idle_us_store, &cfqd->cfq_group_idle, 0, UINT_MAX);

diff --git a/block/deadline-iosched.c b/block/deadline-iosched.c
index c68f6bb..b83f774 100644 (file)
--- a/block/deadline-iosched.c
+++ b/block/deadline-iosched.c
@@ -373,13 +373,12 @@ deadline_var_show(int var, char *page)
        return sprintf(page, "%d\n", var);
 }
 
-static ssize_t
-deadline_var_store(int *var, const char *page, size_t count)
+static void
+deadline_var_store(int *var, const char *page)
 {
        char *p = (char *) page;
 
        *var = simple_strtol(p, &p, 10);
-       return count;
 }
 
 #define SHOW_FUNCTION(__FUNC, __VAR, __CONV)                           \
@@ -403,7 +402,7 @@ static ssize_t __FUNC(struct elevator_queue *e, const char *page, size_t count)
 {                                                                      \
        struct deadline_data *dd = e->elevator_data;                    \
        int __data;                                                     \
-       int ret = deadline_var_store(&__data, (page), count);           \
+       deadline_var_store(&__data, (page));                            \
        if (__data < (MIN))                                             \
                __data = (MIN);                                         \
        else if (__data > (MAX))                                        \
@@ -412,7 +411,7 @@ static ssize_t __FUNC(struct elevator_queue *e, const char *page, size_t count)
                *(__PTR) = msecs_to_jiffies(__data);                    \
        else                                                            \
                *(__PTR) = __data;                                      \
-       return ret;                                                     \
+       return count;                                                   \
 }
 STORE_FUNCTION(deadline_read_expire_store, &dd->fifo_expire[READ], 0, INT_MAX, 1);
 STORE_FUNCTION(deadline_write_expire_store, &dd->fifo_expire[WRITE], 0, INT_MAX, 1);

diff --git a/block/mq-deadline.c b/block/mq-deadline.c
index 1b964a3..c8dfddc 100644 (file)
--- a/block/mq-deadline.c
+++ b/block/mq-deadline.c
@@ -457,13 +457,12 @@ deadline_var_show(int var, char *page)
        return sprintf(page, "%d\n", var);
 }
 
-static ssize_t
-deadline_var_store(int *var, const char *page, size_t count)
+static void
+deadline_var_store(int *var, const char *page)
 {
        char *p = (char *) page;
 
        *var = simple_strtol(p, &p, 10);
-       return count;
 }
 
 #define SHOW_FUNCTION(__FUNC, __VAR, __CONV)                           \
@@ -487,7 +486,7 @@ static ssize_t __FUNC(struct elevator_queue *e, const char *page, size_t count)
 {                                                                      \
        struct deadline_data *dd = e->elevator_data;                    \
        int __data;                                                     \
-       int ret = deadline_var_store(&__data, (page), count);           \
+       deadline_var_store(&__data, (page));                            \
        if (__data < (MIN))                                             \
                __data = (MIN);                                         \
        else if (__data > (MAX))                                        \
@@ -496,7 +495,7 @@ static ssize_t __FUNC(struct elevator_queue *e, const char *page, size_t count)
                *(__PTR) = msecs_to_jiffies(__data);                    \
        else                                                            \
                *(__PTR) = __data;                                      \
-       return ret;                                                     \
+       return count;                                                   \
 }
 STORE_FUNCTION(deadline_read_expire_store, &dd->fifo_expire[READ], 0, INT_MAX, 1);
 STORE_FUNCTION(deadline_write_expire_store, &dd->fifo_expire[WRITE], 0, INT_MAX, 1);