From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752366AbbG1T1F (ORCPT ); Tue, 28 Jul 2015 15:27:05 -0400 Received: from bombadil.infradead.org ([198.137.202.9]:40277 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750886AbbG1T1D (ORCPT ); Tue, 28 Jul 2015 15:27:03 -0400 Message-ID: <55B7D785.6050900@infradead.org> Date: Tue, 28 Jul 2015 12:27:01 -0700 From: Randy Dunlap User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.3.0 MIME-Version: 1.0 To: LKML CC: Dan Williams , linux-nvdimm@ml01.01.org Subject: [PATCH] nvdimm: fix inline function return type warning Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Randy Dunlap 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 Cc: Dan Williams Cc: linux-nvdimm@lists.01.org --- drivers/nvdimm/nd.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- lnx-42-rc4.orig/drivers/nvdimm/nd.h +++ lnx-42-rc4/drivers/nvdimm/nd.h @@ -166,7 +166,7 @@ int nd_btt_probe(struct nd_namespace_com 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; }