zram: Resolve build warnings due to redefined macros

This patch removes build warnings due to redefined macros.

Change-Id: I9c7e50d5fd9bdc6de4415c4893c8041c66420147
Signed-off-by: Wook Song <wook16.song@samsung.com>

diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
index 63b37ed..0dd1bb5 100644 (file)
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@ -53,13 +53,13 @@ static ssize_t name##_show(struct device *d,                \
 }                                                                      \
 static DEVICE_ATTR(name, S_IRUGO, name##_show, NULL);
 
-#define DEVICE_ATTR_RO(name) \
+#define ZRAM_DEVICE_ATTR_RO(name) \
 DEVICE_ATTR(name, S_IRUGO, name##_show, NULL)
 
-#define DEVICE_ATTR_WO(name) \
+#define ZRAM_DEVICE_ATTR_WO(name) \
 DEVICE_ATTR(name, S_IWUSR, NULL, name##_store)
 
-#define DEVICE_ATTR_RW(name) \
+#define ZRAM_DEVICE_ATTR_RW(name) \
 DEVICE_ATTR(name, S_IRUGO | S_IWUSR, name##_show, name##_store)
 
 static inline bool init_done(struct zram *zram)
@@ -1005,16 +1005,16 @@ static const struct block_device_operations zram_devops = {
        .owner = THIS_MODULE
 };
 
-static DEVICE_ATTR_WO(compact);
-static DEVICE_ATTR_RW(disksize);
-static DEVICE_ATTR_RO(initstate);
-static DEVICE_ATTR_WO(reset);
-static DEVICE_ATTR_RO(orig_data_size);
-static DEVICE_ATTR_RO(mem_used_total);
-static DEVICE_ATTR_RW(mem_limit);
-static DEVICE_ATTR_RW(mem_used_max);
-static DEVICE_ATTR_RW(max_comp_streams);
-static DEVICE_ATTR_RW(comp_algorithm);
+static ZRAM_DEVICE_ATTR_WO(compact);
+static ZRAM_DEVICE_ATTR_RW(disksize);
+static ZRAM_DEVICE_ATTR_RO(initstate);
+static ZRAM_DEVICE_ATTR_WO(reset);
+static ZRAM_DEVICE_ATTR_RO(orig_data_size);
+static ZRAM_DEVICE_ATTR_RO(mem_used_total);
+static ZRAM_DEVICE_ATTR_RW(mem_limit);
+static ZRAM_DEVICE_ATTR_RW(mem_used_max);
+static ZRAM_DEVICE_ATTR_RW(max_comp_streams);
+static ZRAM_DEVICE_ATTR_RW(comp_algorithm);
 
 ZRAM_ATTR_RO(num_reads);
 ZRAM_ATTR_RO(num_writes);