From patchwork Wed Mar 28 11:28:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Heiko Stuebner X-Patchwork-Id: 149184 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-pb0-f56.google.com (mail-pb0-f56.google.com [209.85.160.56]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 7AA7DB6EE7 for ; Wed, 28 Mar 2012 22:28:56 +1100 (EST) Received: by pbcun4 with SMTP id un4sf945173pbc.11 for ; Wed, 28 Mar 2012 04:28:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=beta; h=x-beenthere:received-spf:from:to:subject:date:user-agent:cc :references:in-reply-to:mime-version:message-id:x-original-sender :x-original-authentication-results:reply-to:precedence:mailing-list :list-id:x-google-group-id:list-post:list-help:list-archive:sender :list-subscribe:list-unsubscribe:content-type :content-transfer-encoding; bh=KaCOYSJQRx94x4eJi4H4jgU6QM6vZ5MbpnJmQJ2QoX4=; b=x5RsHkikkM73n4CL8PMpW4/2HP19D+EmHxsYygXpltXtyxUuTvozwcyQL84uRF032Y EUE46EGOKxk+MYo68twIzgvDqiFtTSb6FWXLEwOsW7rTaG79HrJKv776M7s1ZQdYEi2P kNV078u+t7uC/KiBWpZEsRbNPgA9Sm23YnuqY= Received: by 10.68.228.5 with SMTP id se5mr4722622pbc.4.1332934133731; Wed, 28 Mar 2012 04:28:53 -0700 (PDT) X-BeenThere: rtc-linux@googlegroups.com Received: by 10.68.223.72 with SMTP id qs8ls3585121pbc.6.gmail; Wed, 28 Mar 2012 04:28:53 -0700 (PDT) Received: by 10.68.74.201 with SMTP id w9mr26107702pbv.0.1332934133313; Wed, 28 Mar 2012 04:28:53 -0700 (PDT) Received: by 10.68.74.201 with SMTP id w9mr26107700pbv.0.1332934133299; Wed, 28 Mar 2012 04:28:53 -0700 (PDT) Received: from s15407518.onlinehome-server.info (s15407518.onlinehome-server.info. [82.165.136.167]) by gmr-mx.google.com with ESMTPS id 6si3465555pbg.2.2012.03.28.04.28.52 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 28 Mar 2012 04:28:52 -0700 (PDT) Received-SPF: neutral (google.com: 82.165.136.167 is neither permitted nor denied by best guess record for domain of heiko@sntech.de) client-ip=82.165.136.167; Received: from p509909d9.dip0.t-ipconnect.de ([80.153.9.217] helo=nx4-rtr-0001.kes) by s15407518.onlinehome-server.info with esmtpa (Exim 4.69) (envelope-from ) id 1SCr3V-0004qD-IQ; Wed, 28 Mar 2012 13:28:45 +0200 Received: from [192.168.30.196] (helo=nx4-deb-0000.localnet) by nx4-rtr-0001.kes with esmtp (Exim 4.69) (envelope-from ) id 1SCr3T-0006d1-P9; Wed, 28 Mar 2012 13:28:45 +0200 From: Heiko =?utf-8?q?St=C3=BCbner?= To: Tushar Behera Subject: [rtc-linux] Re: [PATCH 0/2] Fixes related to rtc-s3c Date: Wed, 28 Mar 2012 13:28:41 +0200 User-Agent: KMail/1.13.7 (Linux/2.6.39-2-amd64; KDE/4.6.4; x86_64; ; ) Cc: rtc-linux@googlegroups.com, linux-samsung-soc@vger.kernel.org, a.zummo@towertech.it, kgene.kim@samsung.com, patches@linaro.org References: <1332931837-3819-1-git-send-email-tushar.behera@linaro.org> In-Reply-To: <1332931837-3819-1-git-send-email-tushar.behera@linaro.org> MIME-Version: 1.0 Message-Id: <201203281328.41802.heiko@sntech.de> X-Original-Sender: heiko@sntech.de X-Original-Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 82.165.136.167 is neither permitted nor denied by best guess record for domain of heiko@sntech.de) smtp.mail=heiko@sntech.de Reply-To: rtc-linux@googlegroups.com Precedence: list Mailing-list: list rtc-linux@googlegroups.com; contact rtc-linux+owners@googlegroups.com List-ID: X-Google-Group-Id: 712029733259 List-Post: , List-Help: , List-Archive: Sender: rtc-linux@googlegroups.com List-Subscribe: , List-Unsubscribe: , Am Mittwoch, 28. März 2012, 12:50:35 schrieb Tushar Behera: > The patches are based on Kukjin's for-next branch and they fix a couple > of compile-time errors and warnings. There was also a fixup patch for these problems posted on 2012-01-04. But it seems to have been forgotten somehow. I think either solution is fine. Heiko For reference the original patch was: ---- 8< ----------------------------------- >8 ---- Subject: [PATCH] rtc-s3c: Fix breakage introduced by S3C2443/S3C2416 support Commits 7006ee4f (rtc-s3c: make room for more variants in devicetree block) and 6c0a2365 (rtc-s3c: add variants for S3C2443 and S3C2416) introduced build-failures with enabled CONFIG_USE_OF option. This patch fixes missing "," in s3c_rtc_dt_match and wrong handling of the of_device_id.data property. Reported-by: Sylwester Nawrocki Signed-off-by: Heiko Stuebner --- drivers/rtc/rtc-s3c.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c index bb0f320..2b4feb8 100644 --- a/drivers/rtc/rtc-s3c.c +++ b/drivers/rtc/rtc-s3c.c @@ -449,7 +449,7 @@ static inline int s3c_rtc_get_driver_data(struct platform_device *pdev) if (pdev->dev.of_node) { const struct of_device_id *match; match = of_match_node(s3c_rtc_dt_match, pdev->dev.of_node); - return match->data; + return (int)match->data; } #endif return platform_get_device_id(pdev)->driver_data; @@ -667,17 +667,17 @@ static int s3c_rtc_resume(struct platform_device *pdev) #ifdef CONFIG_OF static const struct of_device_id s3c_rtc_dt_match[] = { { - .compatible = "samsung,s3c2410-rtc" - .data = TYPE_S3C2410, + .compatible = "samsung,s3c2410-rtc", + .data = (void *)TYPE_S3C2410, }, { - .compatible = "samsung,s3c2416-rtc" - .data = TYPE_S3C2416, + .compatible = "samsung,s3c2416-rtc", + .data = (void *)TYPE_S3C2416, }, { - .compatible = "samsung,s3c2443-rtc" - .data = TYPE_S3C2443, + .compatible = "samsung,s3c2443-rtc", + .data = (void *)TYPE_S3C2443, }, { - .compatible = "samsung,s3c6410-rtc" - .data = TYPE_S3C64XX, + .compatible = "samsung,s3c6410-rtc", + .data = (void *)TYPE_S3C64XX, }, {}, };