From patchwork Tue Apr 15 17:14: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: 3994311 Return-Path: X-Original-To: patchwork-linux-samsung-soc@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 A4DC09F336 for ; Tue, 15 Apr 2014 17:14:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E05C52026D for ; Tue, 15 Apr 2014 17:14:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 857E92026C for ; Tue, 15 Apr 2014 17:14:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752134AbaDOROn (ORCPT ); Tue, 15 Apr 2014 13:14:43 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:34503 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751198AbaDOROn (ORCPT ); Tue, 15 Apr 2014 13:14:43 -0400 Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N43000F518HK550@mailout1.samsung.com>; Wed, 16 Apr 2014 02:14:41 +0900 (KST) X-AuditID: cbfee61a-b7fb26d00000724f-16-534d6901595b Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id C1.3F.29263.1096D435; Wed, 16 Apr 2014 02:14:41 +0900 (KST) Received: from amdc1344.digital.local ([106.116.147.32]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0N43007F71889660@mmp2.samsung.com>; Wed, 16 Apr 2014 02:14:41 +0900 (KST) From: Sylwester Nawrocki To: linux-media@vger.kernel.org Cc: linux-samsung-soc@vger.kernel.org, Sylwester Nawrocki Subject: [PATCH] exynos4-is: Fix compilation for !CONFIG_COMMON_CLK Date: Tue, 15 Apr 2014 19:14:29 +0200 Message-id: <1397582069-27941-1-git-send-email-s.nawrocki@samsung.com> X-Mailer: git-send-email 1.7.9.5 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrBJMWRmVeSWpSXmKPExsVy+t9jQV3GTN9gg8PH1Cx6NmxltZhxfh+T xeE37awOzB59W1YxenzeJBfAFMVlk5Kak1mWWqRvl8CVsXThH6aCZXwVMy+sZ2pgnMfTxcjJ ISFgIrF6xwp2CFtM4sK99WxdjFwcQgLTGSWmvlzJCOF0MElMeH+cGaSKTcBQovdoHyOILSIg L/Gk9wYbiM0sECLx/MdbJhBbWMBZ4vLpF2D1LAKqEo3f7oLFeQXcJO6cawbq5QDapiAxZ5LN BEbuBYwMqxhFUwuSC4qT0nMN9YoTc4tL89L1kvNzNzGC/ftMagfjygaLQ4wCHIxKPLweE3yC hVgTy4orcw8xSnAwK4nw/or3DRbiTUmsrEotyo8vKs1JLT7EKM3BoiTOe6DVOlBIID2xJDU7 NbUgtQgmy8TBKdXAaC/06NjU6GmLywKDfl63/Lz60b/wPd1zbRr2bK8M5r/9Mf1Zb3CFsulf b3lvZ53DIi4X5nxPz2vOOnBmy5VPp1XXG6/+wMx19qzLvh0Tpz332sjBLJGUZ/j23JuXi+cs u+96aZ1kmptjlOn7CKVnF5rvnd2bdPOI9NLpnQ+2FGya/jfytLD6vXolluKMREMt5qLiRAAF cjXq6wEAAA== Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@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;