From patchwork Tue Apr 15 17:34:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Sylwester Nawrocki/Kernel \\(PLT\\) /SRPOL/Staff Engineer/Samsung Electronics" X-Patchwork-Id: 3994401 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 80D779F2CC for ; Tue, 15 Apr 2014 17:35:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B3B6320222 for ; Tue, 15 Apr 2014 17:35:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D60242021A for ; Tue, 15 Apr 2014 17:35:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751925AbaDORe6 (ORCPT ); Tue, 15 Apr 2014 13:34:58 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:35554 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751123AbaDORe4 (ORCPT ); Tue, 15 Apr 2014 13:34:56 -0400 Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N430020U267IY50@mailout1.samsung.com>; Wed, 16 Apr 2014 02:34:55 +0900 (KST) X-AuditID: cbfee61b-b7f456d000006dfd-75-534d6dbf3c3c Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id DB.A9.28157.FBD6D435; Wed, 16 Apr 2014 02:34:55 +0900 (KST) Received: from amdc1344.digital.local ([106.116.147.32]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0N4300IPX25P8X20@mmp1.samsung.com>; Wed, 16 Apr 2014 02:34:54 +0900 (KST) From: Sylwester Nawrocki To: linux-media@vger.kernel.org Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kyungmin.park@samsung.com, kgene.kim@samsung.com, linux-samsung-soc@vger.kernel.org, Sylwester Nawrocki Subject: [PATCH 2/5] exynos4-is: Fix compilation for !CONFIG_COMMON_CLK Date: Tue, 15 Apr 2014 19:34:29 +0200 Message-id: <1397583272-28295-3-git-send-email-s.nawrocki@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1397583272-28295-1-git-send-email-s.nawrocki@samsung.com> References: <1397583272-28295-1-git-send-email-s.nawrocki@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupgluLIzCtJLcpLzFFi42I5/e+xgO7+XN9gg//TNSzmHznHatG74Cqb xdmmN+wWmx5fY7Xo2bCV1WLG+X1MFofftLM6sHtsXlLv0bdlFaPH501yAcxRXDYpqTmZZalF +nYJXBlLF/5hKljGVzHzwnqmBsZ5PF2MnBwSAiYSjet/s0HYYhIX7q0Hsrk4hAQWMUpcfr+I CSQhJNDBJHH6mwCIzSZgKNF7tI8RxBYRkJd40nsDrIFZ4BSjxKKd58ESwgLuEp9X/QRrZhFQ lfh98C4LiM0r4CZx58JyoDgH0DYFiTmTbEDCnEDl++Y8gdrlJrHn9yb2CYy8CxgZVjGKphYk FxQnpeca6RUn5haX5qXrJefnbmIEh88z6R2MqxosDjEKcDAq8fDOzPENFmJNLCuuzD3EKMHB rCTC+yseKMSbklhZlVqUH19UmpNafIhRmoNFSZz3YKt1oJBAemJJanZqakFqEUyWiYNTqoGx 6v5hPbG8tV2adawv/lz5VLviufD2NbEp7U98pr7KD1tluHCqnLC5fJjmTg6G0qXtm7qafipI X1tyfWtptbHB4WDHz0ePu/9ecbGUwcXk3O0Kh7ZfUbmrLyu/XX5l4TKjx2Fr85rfzbh6KEiv UV2b55ViUO1rg+wld5Vf31vicjLkL+cPlV9rlViKMxINtZiLihMBt6myVxsCAAA= Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 CONFIG_COMMON_CLK is not enabled on S5PV210 platform, so include some clk API data structures conditionally to avoid compilation errors. These #ifdefs will be removed for next kernel release, when the S5PV210 platform moves to DT and the common clk API. Signed-off-by: Sylwester Nawrocki Acked-by: Kyungmin Park --- drivers/media/platform/exynos4-is/media-dev.c | 2 +- drivers/media/platform/exynos4-is/media-dev.h | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/exynos4-is/media-dev.c b/drivers/media/platform/exynos4-is/media-dev.c index 2a2d42e..002abbf 100644 --- a/drivers/media/platform/exynos4-is/media-dev.c +++ b/drivers/media/platform/exynos4-is/media-dev.c @@ -1523,7 +1523,7 @@ err: } #else #define fimc_md_register_clk_provider(fmd) (0) -#define fimc_md_unregister_clk_provider(fmd) (0) +#define fimc_md_unregister_clk_provider(fmd) #endif static int subdev_notifier_bound(struct v4l2_async_notifier *notifier, diff --git a/drivers/media/platform/exynos4-is/media-dev.h b/drivers/media/platform/exynos4-is/media-dev.h index ee1e251..58c4945 100644 --- a/drivers/media/platform/exynos4-is/media-dev.h +++ b/drivers/media/platform/exynos4-is/media-dev.h @@ -94,7 +94,9 @@ struct fimc_sensor_info { }; struct cam_clk { +#ifdef CONFIG_COMMON_CLK struct clk_hw hw; +#endif struct fimc_md *fmd; }; #define to_cam_clk(_hw) container_of(_hw, struct cam_clk, hw) @@ -142,7 +144,9 @@ struct fimc_md { struct cam_clk_provider { struct clk *clks[FIMC_MAX_CAMCLKS]; +#ifdef CONFIG_COMMON_CLK struct clk_onecell_data clk_data; +#endif struct device_node *of_node; struct cam_clk camclk[FIMC_MAX_CAMCLKS]; int num_clocks;