From patchwork Wed Jan 4 14:14:16 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiko Stuebner X-Patchwork-Id: 134259 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-bk0-f56.google.com (mail-bk0-f56.google.com [209.85.214.56]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority" (verified OK)) by ozlabs.org (Postfix) with ESMTPS id E09721007D6 for ; Thu, 5 Jan 2012 01:14:41 +1100 (EST) Received: by bkbzt4 with SMTP id zt4sf123818bkb.11 for ; Wed, 04 Jan 2012 06:14:37 -0800 (PST) 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; bh=4r0CLKPQMCb+d5guVklwhOSOJi3pStlG0EQ2mSSsu+s=; b=A5dSAixZg+XAbrU91+6tA31egEj6em3f6PSBeIGTLpkw50lzLgmGjzDy4ZGNlSE1Co K+uO9/uKG7/osGKuFkd0fUelKuFo0YH36WTYI6yG9hVfwSjHyRfMfsyfMncJJY824Y5J Ax4ZUHF4g5eqEIGiWNenb9z8BwFxDvydeciZE= Received: by 10.204.40.198 with SMTP id l6mr561606bke.22.1325686476855; Wed, 04 Jan 2012 06:14:36 -0800 (PST) X-BeenThere: rtc-linux@googlegroups.com Received: by 10.14.0.66 with SMTP id 42ls586788eea.1.canary; Wed, 04 Jan 2012 06:14:36 -0800 (PST) Received: by 10.14.119.4 with SMTP id m4mr8106975eeh.7.1325686476105; Wed, 04 Jan 2012 06:14:36 -0800 (PST) Received: by 10.14.119.4 with SMTP id m4mr8106974eeh.7.1325686476067; Wed, 04 Jan 2012 06:14:36 -0800 (PST) Received: from h1778886.stratoserver.net (h1778886.stratoserver.net. [85.214.133.74]) by gmr-mx.google.com with ESMTPS id s14si33594934eef.1.2012.01.04.06.14.35 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 04 Jan 2012 06:14:36 -0800 (PST) Received-SPF: neutral (google.com: 85.214.133.74 is neither permitted nor denied by best guess record for domain of heiko@sntech.de) client-ip=85.214.133.74; Received: from p509909d9.dip0.t-ipconnect.de ([80.153.9.217] helo=nx4-rtr-0001.kes) by h1778886.stratoserver.net with esmtpa (Exim 4.69) (envelope-from ) id 1RiRbg-0006ht-Fd; Wed, 04 Jan 2012 15:14:20 +0100 Received: from [192.168.30.196] (helo=nx4-deb-0000.localnet) by nx4-rtr-0001.kes with esmtp (Exim 4.69) (envelope-from ) id 1RiRbf-0005PF-4r; Wed, 04 Jan 2012 15:14:20 +0100 From: Heiko =?windows-1252?q?St=FCbner?= To: Kukjin Kim Subject: [rtc-linux] [PATCH] rtc-s3c: Fix breakage introduced by S3C2443/S3C2416 support Date: Wed, 4 Jan 2012 15:14:16 +0100 User-Agent: KMail/1.13.7 (Linux/2.6.39-2-amd64; KDE/4.6.4; x86_64; ; ) Cc: Sylwester Nawrocki , ben-linux@fluff.org, a.zummo@towertech.it, linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, rtc-linux@googlegroups.com References: <201112211014.30695.heiko@sntech.de> <201201041251.42509.heiko@sntech.de> <201201041512.55126.heiko@sntech.de> In-Reply-To: <201201041512.55126.heiko@sntech.de> MIME-Version: 1.0 Message-Id: <201201041514.16813.heiko@sntech.de> X-Original-Sender: heiko@sntech.de X-Original-Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 85.214.133.74 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: , 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 Acked-by: Kukjin Kim --- 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, }, {}, };