block: make QUEUE_SYSFS_BIT_FNS more useful

Switch to the naming used by the other entries so that we can use the
QUEUE_RW_ENTRY helper.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
index 9df877d3dae28b38efd8396e1856b93ecc2a8672..81722cdcf0cb2110a1b35ec594db645591b9726c 100644 (file)
--- a/block/blk-sysfs.c
+++ b/block/blk-sysfs.c
@@ -260,14 +260,14 @@ static ssize_t queue_max_hw_sectors_show(struct request_queue *q, char *page)
 
 #define QUEUE_SYSFS_BIT_FNS(name, flag, neg)                           \
 static ssize_t                                                         \
-queue_show_##name(struct request_queue *q, char *page)                 \
+queue_##name##_show(struct request_queue *q, char *page)               \
 {                                                                      \
        int bit;                                                        \
        bit = test_bit(QUEUE_FLAG_##flag, &q->queue_flags);             \
        return queue_var_show(neg ? !bit : bit, page);                  \
 }                                                                      \
 static ssize_t                                                         \
-queue_store_##name(struct request_queue *q, const char *page, size_t count) \
+queue_##name##_store(struct request_queue *q, const char *page, size_t count) \
 {                                                                      \
        unsigned long val;                                              \
        ssize_t ret;                                                    \
@@ -610,23 +610,9 @@ static struct queue_sysfs_entry queue_hw_sector_size_entry = {
        .show = queue_logical_block_size_show,
 };
 
-static struct queue_sysfs_entry queue_nonrot_entry = {
-       .attr = {.name = "rotational", .mode = 0644 },
-       .show = queue_show_nonrot,
-       .store = queue_store_nonrot,
-};
-
-static struct queue_sysfs_entry queue_iostats_entry = {
-       .attr = {.name = "iostats", .mode = 0644 },
-       .show = queue_show_iostats,
-       .store = queue_store_iostats,
-};
-
-static struct queue_sysfs_entry queue_random_entry = {
-       .attr = {.name = "add_random", .mode = 0644 },
-       .show = queue_show_random,
-       .store = queue_store_random,
-};
+QUEUE_RW_ENTRY(queue_nonrot, "rotational");
+QUEUE_RW_ENTRY(queue_iostats, "iostats");
+QUEUE_RW_ENTRY(queue_random, "add_random");
 
 static struct attribute *queue_attrs[] = {
        &queue_requests_entry.attr,