Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac64a2ce authored by David Disseldorp's avatar David Disseldorp Committed by Nicholas Bellinger
Browse files

target: use stringify.h instead of own definition 



Signed-off-by: default avatarDavid Disseldorp <ddiss@suse.de>
Acked-by: default avatarAndy Grover <agrover@redhat.com>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent ed97d0cd

drivers/target/target_core_user.c

+2 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/parser.h>

#include <linux/vmalloc.h>

#include <linux/uio_driver.h>

#include <linux/stringify.h>

#include <net/genetlink.h>

#include <scsi/scsi_common.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(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].addr = (phys_addr_t) udev->mb_addr;

include/uapi/linux/target_core_user.h

+0 −4
Original line number Diff line number Diff line
@@ -42,10 +42,6 @@ 
#define TCMU_MAILBOX_VERSION 2

#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 {

	__u16 version;

	__u16 flags;