From patchwork Tue Nov 10 00:34:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 7587191 Return-Path: X-Original-To: patchwork-linux-nvdimm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 562E1C05C6 for ; Tue, 10 Nov 2015 00:40:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 930002069D for ; Tue, 10 Nov 2015 00:40:30 +0000 (UTC) Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BE32D20696 for ; Tue, 10 Nov 2015 00:40:29 +0000 (UTC) Received: from ml01.vlan14.01.org (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id B39331A1FD4; Mon, 9 Nov 2015 16:40:29 -0800 (PST) X-Original-To: linux-nvdimm@lists.01.org Delivered-To: linux-nvdimm@lists.01.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by ml01.01.org (Postfix) with ESMTP id 05D721A1FD4 for ; Mon, 9 Nov 2015 16:40:28 -0800 (PST) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP; 09 Nov 2015 16:40:28 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,267,1444719600"; d="scan'208";a="832264203" Received: from dwillia2-desk3.jf.intel.com (HELO dwillia2-desk3.amr.corp.intel.com) ([10.54.39.39]) by fmsmga001.fm.intel.com with ESMTP; 09 Nov 2015 16:40:28 -0800 Subject: [PATCH 3/4] ndctl: move forward declarations of ndctl_[un]bind and to_module From: Dan Williams To: linux-nvdimm@lists.01.org Date: Mon, 09 Nov 2015 19:34:46 -0500 Message-ID: <20151110003446.18262.42087.stgit@dwillia2-desk3.amr.corp.intel.com> In-Reply-To: <20151110003430.18262.20700.stgit@dwillia2-desk3.amr.corp.intel.com> References: <20151110003430.18262.20700.stgit@dwillia2-desk3.amr.corp.intel.com> User-Agent: StGit/0.17.1-9-g687f MIME-Version: 1.0 X-BeenThere: linux-nvdimm@lists.01.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "Linux-nvdimm developer list." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP These static declarations should never have been placed in libndctl-private.h. They cause problems when we go to add new source files that include this header. Signed-off-by: Dan Williams --- lib/libndctl-private.h | 5 ----- lib/libndctl.c | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/libndctl-private.h b/lib/libndctl-private.h index 5326684c119f..78fbb2d46b42 100644 --- a/lib/libndctl-private.h +++ b/lib/libndctl-private.h @@ -170,9 +170,4 @@ static inline int check_kmod(struct kmod_ctx *kmod_ctx) return kmod_ctx ? 0 : -ENXIO; } -static int ndctl_bind(struct ndctl_ctx *ctx, struct kmod_module *module, - const char *devname); -static int ndctl_unbind(struct ndctl_ctx *ctx, const char *devpath); -static struct kmod_module *to_module(struct ndctl_ctx *ctx, const char *alias); - #endif /* _LIBNDCTL_PRIVATE_H_ */ diff --git a/lib/libndctl.c b/lib/libndctl.c index ea3947dd3e33..7db5b6013ab1 100644 --- a/lib/libndctl.c +++ b/lib/libndctl.c @@ -1123,6 +1123,11 @@ NDCTL_EXPORT int ndctl_bus_wait_probe(struct ndctl_bus *bus) return rc < 0 ? -ENXIO : 0; } +static int ndctl_bind(struct ndctl_ctx *ctx, struct kmod_module *module, + const char *devname); +static int ndctl_unbind(struct ndctl_ctx *ctx, const char *devpath); +static struct kmod_module *to_module(struct ndctl_ctx *ctx, const char *alias); + static int add_dimm(void *parent, int id, const char *dimm_base) { int rc = -ENOMEM;