diff options
| author | Christoph Hellwig <hch@lst.de> | 2022-07-18 07:07:26 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2022-08-02 17:22:48 -0600 |
| commit | eb7e2d92588cc6351286de13e3b5d70ecc768888 (patch) | |
| tree | b42709c131a2d12f365ef68260a4170958a7b69e /drivers/nvme | |
| parent | 679c54f2de672b7d79d02f8c4ad483ff6dd8ce2e (diff) | |
| download | linux-stable-eb7e2d92588cc6351286de13e3b5d70ecc768888.tar.gz linux-stable-eb7e2d92588cc6351286de13e3b5d70ecc768888.tar.bz2 linux-stable-eb7e2d92588cc6351286de13e3b5d70ecc768888.zip | |
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: Christoph Hellwig <hch@lst.de>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/nvme')
| -rw-r--r-- | drivers/nvme/host/Makefile | 3 | ||||
| -rw-r--r-- | drivers/nvme/host/constants.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/nvme/host/Makefile b/drivers/nvme/host/Makefile index a3e88f32f560..e27202d22c7d 100644 --- a/drivers/nvme/host/Makefile +++ b/drivers/nvme/host/Makefile @@ -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 diff --git a/drivers/nvme/host/constants.c b/drivers/nvme/host/constants.c index 4910543f00ff..6973c2a17c13 100644 --- a/drivers/nvme/host/constants.c +++ b/drivers/nvme/host/constants.c @@ -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 */ |