Commit eb7e2d92 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

nvme: don't always build constants.o 



The entire content of constants.c if guarded by an ifdef, so switch to
just building the file conditionally instead.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarKeith Busch <kbusch@kernel.org>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 679c54f2

drivers/nvme/host/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -10,7 +10,8 @@ obj-$(CONFIG_NVME_FC) += nvme-fc.o 
obj-$(CONFIG_NVME_TCP)			+= nvme-tcp.o

obj-$(CONFIG_NVME_APPLE)		+= nvme-apple.o



nvme-core-y				:= core.o ioctl.o constants.o

nvme-core-y				+= core.o ioctl.o

nvme-core-$(CONFIG_NVME_VERBOSE_ERRORS)	+= constants.o

nvme-core-$(CONFIG_TRACING)		+= trace.o

nvme-core-$(CONFIG_NVME_MULTIPATH)	+= multipath.o

nvme-core-$(CONFIG_BLK_DEV_ZONED)	+= zns.o

drivers/nvme/host/constants.c

+0 −2
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 


#include "nvme.h"



#ifdef CONFIG_NVME_VERBOSE_ERRORS

static const char * const nvme_ops[] = {

	[nvme_cmd_flush] = "Flush",

	[nvme_cmd_write] = "Write",
@@ -185,4 +184,3 @@ const unsigned char *nvme_get_admin_opcode_str(u8 opcode) 
		return nvme_admin_ops[opcode];

	return "Unknown";

}
 
#endif /* CONFIG_NVME_VERBOSE_ERRORS */