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

Commit c4699e70 authored by Keith Busch's avatar Keith Busch Committed by Jens Axboe
Browse files

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: default avatarKeith Busch <keith.busch@intel.com>
Signed-off-by: default avatarMatias Bjørling <m@bjorling.me>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 77032ca6

drivers/nvme/host/Makefile

+2 −1
Original line number Diff line number Diff line 


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)

drivers/nvme/host/lightnvm.c

+0 −13
Original line number Diff line number Diff line
@@ -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 */

drivers/nvme/host/nvme.h

+14 −0
Original line number Diff line number Diff line
@@ -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 */