* [PATCH] lightnvm: Simplify config when disabled
@ 2015-11-23 18:55 Keith Busch
2015-11-23 20:12 ` Matias Bjørling
0 siblings, 1 reply; 2+ messages in thread
From: Keith Busch @ 2015-11-23 18:55 UTC (permalink / raw)
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 at intel.com>
---
drivers/nvme/host/Makefile | 3 ++-
drivers/nvme/host/lightnvm.c | 13 -------------
drivers/nvme/host/nvme.h | 14 ++++++++++++++
3 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/drivers/nvme/host/Makefile b/drivers/nvme/host/Makefile
index 219dc206..a5fe239 100644
--- a/drivers/nvme/host/Makefile
+++ b/drivers/nvme/host/Makefile
@@ -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)
diff --git a/drivers/nvme/host/lightnvm.c b/drivers/nvme/host/lightnvm.c
index 9202d1a..07451d6 100644
--- a/drivers/nvme/host/lightnvm.c
+++ b/drivers/nvme/host/lightnvm.c
@@ -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 */
diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
index fdb4e5b..044253d 100644
--- a/drivers/nvme/host/nvme.h
+++ b/drivers/nvme/host/nvme.h
@@ -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 */
--
2.6.2.307.g37023ba
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH] lightnvm: Simplify config when disabled
2015-11-23 18:55 [PATCH] lightnvm: Simplify config when disabled Keith Busch
@ 2015-11-23 20:12 ` Matias Bjørling
0 siblings, 0 replies; 2+ messages in thread
From: Matias Bjørling @ 2015-11-23 20:12 UTC (permalink / raw)
On 11/23/2015 07:55 PM, Keith Busch wrote:
> 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 at intel.com>
> ---
> drivers/nvme/host/Makefile | 3 ++-
> drivers/nvme/host/lightnvm.c | 13 -------------
> drivers/nvme/host/nvme.h | 14 ++++++++++++++
> 3 files changed, 16 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/nvme/host/Makefile b/drivers/nvme/host/Makefile
> index 219dc206..a5fe239 100644
> --- a/drivers/nvme/host/Makefile
> +++ b/drivers/nvme/host/Makefile
> @@ -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)
> diff --git a/drivers/nvme/host/lightnvm.c b/drivers/nvme/host/lightnvm.c
> index 9202d1a..07451d6 100644
> --- a/drivers/nvme/host/lightnvm.c
> +++ b/drivers/nvme/host/lightnvm.c
> @@ -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 */
> diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
> index fdb4e5b..044253d 100644
> --- a/drivers/nvme/host/nvme.h
> +++ b/drivers/nvme/host/nvme.h
> @@ -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 */
>
Thanks Keith.
Reviewed-by: Matias Bj?rling <m at bjorling.me>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-11-23 20:12 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-23 18:55 [PATCH] lightnvm: Simplify config when disabled Keith Busch
2015-11-23 20:12 ` Matias Bjørling
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.