From patchwork Tue Nov 2 01:52:01 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kyungmin Park X-Patchwork-Id: 69858 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-pw0-f56.google.com (mail-pw0-f56.google.com [209.85.160.56]) by ozlabs.org (Postfix) with ESMTP id 86D4B1007D3 for ; Tue, 2 Nov 2010 12:52:11 +1100 (EST) Received: by pwi7 with SMTP id 7sf553340pwi.11 for ; Mon, 01 Nov 2010 18:52:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=beta; h=domainkey-signature:received:x-beenthere:received:received:received :received:received-spf:received:received:received:received:date:from :subject:to:message-id:mime-version:user-agent:x-originalarrivaltime :x-original-sender:x-original-authentication-results:reply-to :precedence:mailing-list:list-id:list-post:list-help:list-archive :sender:list-subscribe:list-unsubscribe:content-type :content-disposition; bh=V1BIuis2ueJZelb2wsYt9xvugSDuElvE0YEGWnC21n4=; b=b9Ne+F0TkbW2ggVed5Av565EZ/wFyI2R9raixwUi3KJHsWvnp38XESHVRM1l7LYSGF qjbj8r6kWZdobalO8DNNx4/7JzpIewF4oLQM6H9TwrKIdB3GSHcyaEwIEhWzxfaAVbgv Joun9fCY6wqWVjnhYbDqsWVKJw2OAI5xrtzgs= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlegroups.com; s=beta; h=x-beenthere:received-spf:date:from:subject:to:message-id :mime-version:user-agent:x-originalarrivaltime:x-original-sender :x-original-authentication-results:reply-to:precedence:mailing-list :list-id:list-post:list-help:list-archive:sender:list-subscribe :list-unsubscribe:content-type:content-disposition; b=BzPDde7zRt56fXbu1G4pyHOmqbLrY52D92Thgoih2fBNgdzt64XxTsjcSM/PFvL5/d h7lWgl1agV8MlQsg9M/IgoU3hec9RjshGnheI1pG7nM9uhCsG27tu5osDZU+2e/DpECE e56h7ckQ4MHiZnyc3R1BIxy0CD3Tw0vG/bPMI= Received: by 10.143.153.15 with SMTP id f15mr231827wfo.1.1288662728544; Mon, 01 Nov 2010 18:52:08 -0700 (PDT) X-BeenThere: rtc-linux@googlegroups.com Received: by 10.142.6.9 with SMTP id 9ls6688062wff.3.p; Mon, 01 Nov 2010 18:52:08 -0700 (PDT) Received: by 10.142.177.9 with SMTP id z9mr3974980wfe.18.1288662728101; Mon, 01 Nov 2010 18:52:08 -0700 (PDT) Received: by 10.142.177.9 with SMTP id z9mr3974979wfe.18.1288662728078; Mon, 01 Nov 2010 18:52:08 -0700 (PDT) Received: from mailout2.samsung.com (mailout2.samsung.com [203.254.224.25]) by gmr-mx.google.com with ESMTP id n6si11229866wfl.7.2010.11.01.18.52.07; Mon, 01 Nov 2010 18:52:07 -0700 (PDT) Received-SPF: neutral (google.com: 203.254.224.25 is neither permitted nor denied by best guess record for domain of kmpark@infradead.org) client-ip=203.254.224.25; Received: from epmmp1 (mailout2.samsung.com [203.254.224.25]) by mailout2.samsung.com (Sun Java(tm) System Messaging Server 7u3-15.01 64bit (built Feb 12 2010)) with ESMTP id <0LB800IZ0IIUJD80@mailout2.samsung.com> for rtc-linux@googlegroups.com; Tue, 02 Nov 2010 10:52:06 +0900 (KST) Received: from TNRNDGASPAPP1.tn.corp.samsungelectronics.net ([165.213.149.150]) by mmp1.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTPA id <0LB80039BIIU65@mmp1.samsung.com> for rtc-linux@googlegroups.com; Tue, 02 Nov 2010 10:52:06 +0900 (KST) Received: from july ([10.89.10.219]) by TNRNDGASPAPP1.tn.corp.samsungelectronics.net with Microsoft SMTPSVC(6.0.3790.4675); Tue, 02 Nov 2010 10:52:05 +0900 Received: by july (sSMTP sendmail emulation); Tue, 02 Nov 2010 10:52:01 +0900 Date: Tue, 02 Nov 2010 10:52:01 +0900 From: Kyungmin Park Subject: [rtc-linux] [PATCH] rtc: rtc-s3c: Fix type mismatch of alarm_irq_enable To: Alessandro Zummo , rtc-linux@googlegroups.com, linux-kernel@vger.kernel.org Message-id: <20101102015201.GA6974@july> MIME-version: 1.0 User-Agent: Mutt/1.5.17 (2007-11-01) X-OriginalArrivalTime: 02 Nov 2010 01:52:05.0240 (UTC) FILETIME=[8CF9EF80:01CB7A30] X-Original-Sender: kmpark@infradead.org X-Original-Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 203.254.224.25 is neither permitted nor denied by best guess record for domain of kmpark@infradead.org) smtp.mail=kmpark@infradead.org Reply-To: rtc-linux@googlegroups.com Precedence: list Mailing-list: list rtc-linux@googlegroups.com; contact rtc-linux+owners@googlegroups.com List-ID: List-Post: , List-Help: , List-Archive: Sender: rtc-linux@googlegroups.com List-Subscribe: , List-Unsubscribe: , Content-type: text/plain; charset=ISO-8859-1 Content-disposition: inline From: Kyungmin Park Fix type mismatch of alarm_irq_enable Signed-off-by: Kyungmin Park --- drivers/rtc/rtc-s3c.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c index cf953ec..4101522 100644 --- a/drivers/rtc/rtc-s3c.c +++ b/drivers/rtc/rtc-s3c.c @@ -77,7 +77,7 @@ static irqreturn_t s3c_rtc_tickirq(int irq, void *id) } /* Update control registers */ -static void s3c_rtc_setaie(int to) +static int s3c_rtc_setaie(struct device *dev, unsigned int to) { unsigned int tmp; @@ -89,6 +89,8 @@ static void s3c_rtc_setaie(int to) tmp |= S3C2410_RTCALM_ALMEN; writeb(tmp, s3c_rtc_base + S3C2410_RTCALM); + + return 0; } static int s3c_rtc_setpie(struct device *dev, int enabled) @@ -308,7 +310,7 @@ static int s3c_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm) writeb(alrm_en, base + S3C2410_RTCALM); - s3c_rtc_setaie(alrm->enabled); + s3c_rtc_setaie(dev, alrm->enabled); return 0; } @@ -440,7 +442,7 @@ static int __devexit s3c_rtc_remove(struct platform_device *dev) rtc_device_unregister(rtc); s3c_rtc_setpie(&dev->dev, 0); - s3c_rtc_setaie(0); + s3c_rtc_setaie(&dev->dev, 0); clk_disable(rtc_clk); clk_put(rtc_clk);