浏览代码

target: use stringify.h instead of own definition

Signed-off-by: David Disseldorp <ddiss@suse.de>
Acked-by: Andy Grover <agrover@redhat.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
David Disseldorp 10 年之前
父节点
当前提交
ac64a2ce50
共有 2 个文件被更改,包括 2 次插入5 次删除
  1. 2 1
      drivers/target/target_core_user.c
  2. 0 4
      include/uapi/linux/target_core_user.h

+ 2 - 1
drivers/target/target_core_user.c

@@ -25,6 +25,7 @@
 #include <linux/parser.h>
 #include <linux/parser.h>
 #include <linux/vmalloc.h>
 #include <linux/vmalloc.h>
 #include <linux/uio_driver.h>
 #include <linux/uio_driver.h>
+#include <linux/stringify.h>
 #include <net/genetlink.h>
 #include <net/genetlink.h>
 #include <scsi/scsi_common.h>
 #include <scsi/scsi_common.h>
 #include <scsi/scsi_proto.h>
 #include <scsi/scsi_proto.h>
@@ -898,7 +899,7 @@ static int tcmu_configure_device(struct se_device *dev)
 	WARN_ON(!PAGE_ALIGNED(udev->data_off));
 	WARN_ON(!PAGE_ALIGNED(udev->data_off));
 	WARN_ON(udev->data_size % PAGE_SIZE);
 	WARN_ON(udev->data_size % PAGE_SIZE);
 
 
-	info->version = xstr(TCMU_MAILBOX_VERSION);
+	info->version = __stringify(TCMU_MAILBOX_VERSION);
 
 
 	info->mem[0].name = "tcm-user command & data buffer";
 	info->mem[0].name = "tcm-user command & data buffer";
 	info->mem[0].addr = (phys_addr_t) udev->mb_addr;
 	info->mem[0].addr = (phys_addr_t) udev->mb_addr;

+ 0 - 4
include/uapi/linux/target_core_user.h

@@ -42,10 +42,6 @@
 #define TCMU_MAILBOX_VERSION 2
 #define TCMU_MAILBOX_VERSION 2
 #define ALIGN_SIZE 64 /* Should be enough for most CPUs */
 #define ALIGN_SIZE 64 /* Should be enough for most CPUs */
 
 
-/* See https://gcc.gnu.org/onlinedocs/cpp/Stringification.html */
-#define xstr(s) str(s)
-#define str(s) #s
-
 struct tcmu_mailbox {
 struct tcmu_mailbox {
 	__u16 version;
 	__u16 version;
 	__u16 flags;
 	__u16 flags;