From patchwork Mon Nov 26 19:20:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Russ Dill X-Patchwork-Id: 1806231 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id A4D10DF2EB for ; Mon, 26 Nov 2012 19:20:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755245Ab2KZTUO (ORCPT ); Mon, 26 Nov 2012 14:20:14 -0500 Received: from mail-pb0-f46.google.com ([209.85.160.46]:40019 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755223Ab2KZTUN (ORCPT ); Mon, 26 Nov 2012 14:20:13 -0500 Received: by mail-pb0-f46.google.com with SMTP id wy7so8250719pbc.19 for ; Mon, 26 Nov 2012 11:20:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:mime-version :content-type:content-transfer-encoding; bh=BgLE0dgM3bP7JMCM/vnp/Tt2qizcekBUYVZyQkllddg=; b=pDj5dZ+LvNN0JbTIaSNKILBQbPbsF7IJgu1bca1r/2DZ2tD06xTCC1il2jmDOlsx+3 y+JD/kR+iYoR615nEDFcHwKwcmvFWnprHd9joG8QSJcGZq/ipiezoV3y415JlRLaqEkx rZ5djRY4CVDnzAiADbRAfeDzjXX43/73Iu+6GVMkFnxG9IUaAeuIKBuTejg8Opfkk2nB fVFEbhSs6hY5dFQ1ou7fEc5vq/+EuFChSWzqpSZ1pLXBQrWBx9EFZOr8onbSaW2DftqI jkLEaZ29djakUXwNZV+CQr04d9hK+apjFJz1v3RdAhHAppzCfoHPQTCym8687XZHlRUB HByg== Received: by 10.68.209.170 with SMTP id mn10mr40743004pbc.11.1353957612606; Mon, 26 Nov 2012 11:20:12 -0800 (PST) Received: from localhost (pool-74-100-57-85.lsanca.fios.verizon.net. [74.100.57.85]) by mx.google.com with ESMTPS id mt15sm9197774pbc.49.2012.11.26.11.20.11 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 26 Nov 2012 11:20:11 -0800 (PST) From: Russ Dill To: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: mturquette@ti.com, Russ Dill Subject: [PATCH] Don't mark shared helper functions as inline Date: Mon, 26 Nov 2012 11:20:09 -0800 Message-Id: <1353957609-1295-1-git-send-email-Russ.Dill@ti.com> X-Mailer: git-send-email 1.8.0 MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org The helper functions that access the opaque struct clk should not be marked inline since they are contained in clk.c, but expected to be used by other compilation units. This causes compile errors under gcc-4.7 In file included from arch/arm/mach-omap2/clockdomain.c:25:0: arch/arm/mach-omap2/clockdomain.c: In function ‘clkdm_clk_disable’: include/linux/clk-provider.h:338:12: error: inlining failed in call to always_inline ‘__clk_get_enable_count’: function body not available arch/arm/mach-omap2/clockdomain.c:1001:28: error: called from here make[1]: *** [arch/arm/mach-omap2/clockdomain.o] Error 1 make: *** [arch/arm/mach-omap2] Error 2 Signed-off-by: Russ Dill --- drivers/clk/clk.c | 14 +++++++------- include/linux/clk-provider.h | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index 56e4495e..ed01746 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -249,32 +249,32 @@ late_initcall(clk_disable_unused); /*** helper functions ***/ -inline const char *__clk_get_name(struct clk *clk) +const char *__clk_get_name(struct clk *clk) { return !clk ? NULL : clk->name; } -inline struct clk_hw *__clk_get_hw(struct clk *clk) +struct clk_hw *__clk_get_hw(struct clk *clk) { return !clk ? NULL : clk->hw; } -inline u8 __clk_get_num_parents(struct clk *clk) +u8 __clk_get_num_parents(struct clk *clk) { return !clk ? -EINVAL : clk->num_parents; } -inline struct clk *__clk_get_parent(struct clk *clk) +struct clk *__clk_get_parent(struct clk *clk) { return !clk ? NULL : clk->parent; } -inline int __clk_get_enable_count(struct clk *clk) +int __clk_get_enable_count(struct clk *clk) { return !clk ? -EINVAL : clk->enable_count; } -inline int __clk_get_prepare_count(struct clk *clk) +int __clk_get_prepare_count(struct clk *clk) { return !clk ? -EINVAL : clk->prepare_count; } @@ -300,7 +300,7 @@ out: return ret; } -inline unsigned long __clk_get_flags(struct clk *clk) +unsigned long __clk_get_flags(struct clk *clk) { return !clk ? -EINVAL : clk->flags; } diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h index c127315..f9f5e9e 100644 --- a/include/linux/clk-provider.h +++ b/include/linux/clk-provider.h @@ -335,8 +335,8 @@ const char *__clk_get_name(struct clk *clk); struct clk_hw *__clk_get_hw(struct clk *clk); u8 __clk_get_num_parents(struct clk *clk); struct clk *__clk_get_parent(struct clk *clk); -inline int __clk_get_enable_count(struct clk *clk); -inline int __clk_get_prepare_count(struct clk *clk); +int __clk_get_enable_count(struct clk *clk); +int __clk_get_prepare_count(struct clk *clk); unsigned long __clk_get_rate(struct clk *clk); unsigned long __clk_get_flags(struct clk *clk); int __clk_is_enabled(struct clk *clk);