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: =?utf-8?q?Heiko_St=C3=BCbner?= X-Patchwork-Id: 7510 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id E4E1323DEA for ; Wed, 28 Mar 2012 11:28:59 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 855ACA183F7 for ; Wed, 28 Mar 2012 11:28:59 +0000 (UTC) Received: by iage36 with SMTP id e36so1803671iag.11 for ; Wed, 28 Mar 2012 04:28:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to :subject:date:user-agent:cc:references:in-reply-to:mime-version :content-type:content-transfer-encoding:message-id :x-gm-message-state; bh=qMTdNMuRj/Q2tmyk8AEO2Ph1OQVPwioWL9136GDGzjQ=; b=iQR7URf52k1D5/x1N4q43r4ukqAadwhNrIS3Ble/JXUGsMVXnZWOTLiZllmEW+ZHJw c9t9SyuAfp0O/USCxjhXWRBd3bx0IbRSiY7ZHVLt0p3DuNZUH1sytUWSlK1ESxICxna4 gMF0wGWUq4FyahG43k7+HXTNK5K60WFG/TMyrDQ+hyHABJz4v2nGco4/YtW3tMOf5bkB wiIkRtv2wvn2iLqnFLoe85CjXsFoM3LtRj6lrZoDx2XfZcfwdsq3SYoj7B67gf3WtrJg osPxcemdXU5XPX7JuXaq5SVz+cZhraI/xGodkgEigPbTfqTbmfcyIOHHzkOvF0jdZ1XW ogFQ== Received: by 10.43.134.199 with SMTP id id7mr17220891icc.21.1332934138797; Wed, 28 Mar 2012 04:28:58 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.5.205 with SMTP id 13csp47259ibw; Wed, 28 Mar 2012 04:28:57 -0700 (PDT) Received: by 10.180.84.164 with SMTP id a4mr6283509wiz.2.1332934136950; Wed, 28 Mar 2012 04:28:56 -0700 (PDT) Received: from s15407518.onlinehome-server.info (s15407518.onlinehome-server.info. [82.165.136.167]) by mx.google.com with ESMTPS id 7si2784258wel.122.2012.03.28.04.28.55 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 28 Mar 2012 04:28:56 -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; Authentication-Results: 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 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: 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-Gm-Message-State: ALoCoQlQLcZ0knMes7QRz9csopyB4gz16CPqUJ2w8NAnIJzh2SlBjWaga0pfkVtmBZeM/9y/EqQZ 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, }, {}, };