From patchwork Tue Sep 9 06:11:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mike Turquette X-Patchwork-Id: 37024 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f70.google.com (mail-oa0-f70.google.com [209.85.219.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id BB7432054D for ; Tue, 9 Sep 2014 06:12:02 +0000 (UTC) Received: by mail-oa0-f70.google.com with SMTP id eb12sf81513535oac.9 for ; Mon, 08 Sep 2014 23:12:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe:content-type :content-transfer-encoding; bh=bfqnI3eKDIOuGHQsVHiQgP0c7WTce6BuLQJUuWxcS3w=; b=k2tgsh4LCtCPhFbFOgTLp7Gz5vvVMfGH/N0jFW0IPc9kHcLMCCMSQlgGanqM9GKwYU S50y+1yGqVCDEgqT23chWrU3kD2XZHFLEI+XsXUPGzYbEWsDqvPflJRPs9/tbtHmuAR8 dTJlWVsupuUSJgGGPjUQ8NhPb+PGz4NDJL1OJox9+VscQemJSOaYaOs2nieb8iiMTR2R igfMSzu7OM+2pQ7Db5y5jONzPuruN/fOmXZrY/H7M3x9vfI+AHIxaUEOZsYrOjzBx1C/ 9vkno8gFoVN4rbvFbRzOCNTlzj+O0sAMxqN4Nm8w0cMEBbEiqI/41bvc679liUUi904t vebw== X-Gm-Message-State: ALoCoQm7QIJSp2lcJ+MMT63Y2JqOqUdFVGgEtng0Co9TQbeldNBmWmsx6JsB5dRrrQebUF9+3g5D X-Received: by 10.182.43.164 with SMTP id x4mr21126426obl.5.1410243119888; Mon, 08 Sep 2014 23:11:59 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.18.193 with SMTP id 59ls2114477qgf.7.gmail; Mon, 08 Sep 2014 23:11:59 -0700 (PDT) X-Received: by 10.52.83.227 with SMTP id t3mr23258010vdy.20.1410243119793; Mon, 08 Sep 2014 23:11:59 -0700 (PDT) Received: from mail-vc0-f172.google.com (mail-vc0-f172.google.com [209.85.220.172]) by mx.google.com with ESMTPS id vx5si4894486vcb.0.2014.09.08.23.11.59 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 08 Sep 2014 23:11:59 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.172 as permitted sender) client-ip=209.85.220.172; Received: by mail-vc0-f172.google.com with SMTP id hy10so2844797vcb.31 for ; Mon, 08 Sep 2014 23:11:59 -0700 (PDT) X-Received: by 10.52.129.200 with SMTP id ny8mr1734685vdb.27.1410243119704; Mon, 08 Sep 2014 23:11:59 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.221.45.67 with SMTP id uj3csp236591vcb; Mon, 8 Sep 2014 23:11:59 -0700 (PDT) X-Received: by 10.68.200.101 with SMTP id jr5mr26917477pbc.36.1410243118864; Mon, 08 Sep 2014 23:11:58 -0700 (PDT) Received: from mail-pd0-f170.google.com (mail-pd0-f170.google.com [209.85.192.170]) by mx.google.com with ESMTPS id jd1si21159898pbd.206.2014.09.08.23.11.58 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 08 Sep 2014 23:11:58 -0700 (PDT) Received-SPF: pass (google.com: domain of mturquette@linaro.org designates 209.85.192.170 as permitted sender) client-ip=209.85.192.170; Received: by mail-pd0-f170.google.com with SMTP id fp1so553737pdb.15 for ; Mon, 08 Sep 2014 23:11:58 -0700 (PDT) X-Received: by 10.66.145.133 with SMTP id su5mr15950805pab.11.1410243118460; Mon, 08 Sep 2014 23:11:58 -0700 (PDT) Received: from quantum.home (pool-108-47-66-231.lsanca.fios.verizon.net. [108.47.66.231]) by mx.google.com with ESMTPSA id z3sm381436pbt.91.2014.09.08.23.11.56 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 08 Sep 2014 23:11:57 -0700 (PDT) From: Mike Turquette To: s.nawrocki@samsung.com, tomeu.vizoso@collabora.com Cc: linux@arm.linux.org.uk, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, patches@linaro.org, Mike Turquette Subject: [PATCH 2/2] asm-generic: COMMON_CLK defines __clk_{get,put} Date: Mon, 8 Sep 2014 23:11:26 -0700 Message-Id: <1410243086-14925-1-git-send-email-mturquette@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1410242868-14750-1-git-send-email-mturquette@linaro.org> References: <1410242868-14750-1-git-send-email-mturquette@linaro.org> MIME-Version: 1.0 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: mturquette@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.172 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , If CONFIG_COMMON_CLK is selected then __clk_get and __clk_put are defined in drivers/clk/clk.c and declared in include/linux/clkdev.h. Sylwester's series[0] to properly support clk_{get,put} in the common clock framework made changes to the asm-specific clkdev.h headers, but not the asm-generic version. Tomeu's recent changes[1] to introduce a provider/consumer split in the clock framework uncovered this problem, causing the following build error on any architecture using the asm-generic clkdev.h (e.g. x86 architecture and the ACPI LPSS driver): In file included from drivers/acpi/acpi_lpss.c:15:0: include/linux/clkdev.h:59:5: error: conflicting types for ‘__clk_get’ int __clk_get(struct clk_core *clk); ^ In file included from arch/x86/include/generated/asm/clkdev.h:1:0, from include/linux/clkdev.h:15, from drivers/acpi/acpi_lpss.c:15: include/asm-generic/clkdev.h:20:19: note: previous definition of ‘__clk_get’ was here static inline int __clk_get(struct clk *clk) { return 1; } ^ Fixed by only declarating __clk_get and __clk_put when CONFIG_COMMON_CLK is set. [0] http://lkml.kernel.org/r/<1386177127-2894-5-git-send-email-s.nawrocki@samsung.com> [1] http://lkml.kernel.org/r/<1409758148-20104-1-git-send-email-tomeu.vizoso@collabora.com> Signed-off-by: Mike Turquette --- include/asm-generic/clkdev.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/asm-generic/clkdev.h b/include/asm-generic/clkdev.h index 90a32a6..4ff33474 100644 --- a/include/asm-generic/clkdev.h +++ b/include/asm-generic/clkdev.h @@ -15,10 +15,12 @@ #include +#ifndef CONFIG_COMMON_CLK struct clk; static inline int __clk_get(struct clk *clk) { return 1; } static inline void __clk_put(struct clk *clk) { } +#endif static inline struct clk_lookup_alloc *__clkdev_alloc(size_t size) {