summary refs log tree commit diff
path: root/drivers/nvdimm
diff options
context:
space:
mode:
authorRandy Dunlap <rdunlap@infradead.org>2015-07-28 12:27:01 -0700
committerDan Williams <dan.j.williams@intel.com>2015-07-31 18:17:09 -0400
commitf6ef5a2a50816b58e3126206de13d0b9fdf89df5 (patch)
treea881bb78a27d19bf6e4eba2cabc0c9146a88585e /drivers/nvdimm
parent60e95f43fc8573e81f54b0c1e0bc542c2260d956 (diff)
downloadlinux-f6ef5a2a50816b58e3126206de13d0b9fdf89df5.tar.gz
nvdimm: fix inline function return type warning
Fix multiple build warnings when CONFIG_BTT is not enabled:

In file included from ../drivers/nvdimm/bus.c:29:0:
../drivers/nvdimm/nd.h:169:15: warning: return type defaults to 'int' [-Wreturn-type]
 static inline nd_btt_probe(struct nd_namespace_common *ndns, void *drvdata)
               ^

Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: linux-nvdimm@lists.01.org
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/nvdimm')
-rw-r--r--drivers/nvdimm/nd.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvdimm/nd.h b/drivers/nvdimm/nd.h
index c41f53e74277..835263e47bb8 100644
--- a/drivers/nvdimm/nd.h
+++ b/drivers/nvdimm/nd.h
@@ -166,7 +166,7 @@ int nd_btt_probe(struct nd_namespace_common *ndns, void *drvdata);
 bool is_nd_btt(struct device *dev);
 struct device *nd_btt_create(struct nd_region *nd_region);
 #else
-static inline nd_btt_probe(struct nd_namespace_common *ndns, void *drvdata)
+static inline int nd_btt_probe(struct nd_namespace_common *ndns, void *drvdata)
 {
 	return -ENODEV;
 }