forked from Minki/linux
lightnvm: Simplify config when disabled
We shouldn't compile an object file to get empty implementations; conforms to linux coding style on conditional compilation. Signed-off-by: Keith Busch <keith.busch@intel.com> Signed-off-by: Matias Bjørling <m@bjorling.me> Signed-off-by: Jens Axboe <axboe@fb.com>
This commit is contained in:
parent
77032ca66f
commit
c4699e70d1
@ -1,4 +1,5 @@
|
||||
|
||||
obj-$(CONFIG_BLK_DEV_NVME) += nvme.o
|
||||
|
||||
nvme-y += pci.o scsi.o lightnvm.o
|
||||
lightnvm-$(CONFIG_NVM) := lightnvm.o
|
||||
nvme-y += pci.o scsi.o $(lightnvm-y)
|
||||
|
@ -22,8 +22,6 @@
|
||||
|
||||
#include "nvme.h"
|
||||
|
||||
#ifdef CONFIG_NVM
|
||||
|
||||
#include <linux/nvme.h>
|
||||
#include <linux/bitops.h>
|
||||
#include <linux/lightnvm.h>
|
||||
@ -588,14 +586,3 @@ int nvme_nvm_ns_supported(struct nvme_ns *ns, struct nvme_id_ns *id)
|
||||
|
||||
return 0;
|
||||
}
|
||||
#else
|
||||
int nvme_nvm_register(struct request_queue *q, char *disk_name)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
void nvme_nvm_unregister(struct request_queue *q, char *disk_name) {};
|
||||
int nvme_nvm_ns_supported(struct nvme_ns *ns, struct nvme_id_ns *id)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
#endif /* CONFIG_NVM */
|
||||
|
@ -136,8 +136,22 @@ int nvme_sg_io(struct nvme_ns *ns, struct sg_io_hdr __user *u_hdr);
|
||||
int nvme_sg_io32(struct nvme_ns *ns, unsigned long arg);
|
||||
int nvme_sg_get_version_num(int __user *ip);
|
||||
|
||||
#ifdef CONFIG_NVM
|
||||
int nvme_nvm_ns_supported(struct nvme_ns *ns, struct nvme_id_ns *id);
|
||||
int nvme_nvm_register(struct request_queue *q, char *disk_name);
|
||||
void nvme_nvm_unregister(struct request_queue *q, char *disk_name);
|
||||
#else
|
||||
static inline int nvme_nvm_register(struct request_queue *q, char *disk_name)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline void nvme_nvm_unregister(struct request_queue *q, char *disk_name) {};
|
||||
|
||||
static inline int nvme_nvm_ns_supported(struct nvme_ns *ns, struct nvme_id_ns *id)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
#endif /* CONFIG_NVM */
|
||||
|
||||
#endif /* _NVME_H */
|
||||
|
Loading…
Reference in New Issue
Block a user