From patchwork Mon Mar 1 10:53:42 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= X-Patchwork-Id: 46537 Return-Path: <3L52LSwAACaMUWF-OLQXaJRRJOHJURXSV.FRP@groups.bounces.google.com> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-yx0-f154.google.com (mail-yx0-f154.google.com [209.85.210.154]) by ozlabs.org (Postfix) with ESMTP id 10D81B7CF9 for ; Mon, 1 Mar 2010 21:55:44 +1100 (EST) Received: by yxe26 with SMTP id 26sf4055366yxe.29 for ; Mon, 01 Mar 2010 02:55:43 -0800 (PST) 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:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references:mime-version:to :x-sa-exim-connect-ip:x-sa-exim-mail-from:x-sa-exim-scanned :x-ptx-original-recipient:x-original-authentication-results :x-original-sender:reply-to:precedence:mailing-list:list-id :list-post:list-help:list-archive:x-thread-url:x-message-url:sender :list-subscribe:list-unsubscribe:content-type :content-transfer-encoding; bh=RiCFrH74OthrI+9axAanJpc6a03a8TwHg4mFaV7+6q4=; b=4MDwnnNK3+gTtmowEu2IGP0VS7lf/1xuQMLRoKgbTzUTW53ehIzwxEbx9+J99RKtmG msjCy3WqbyBpe4z+tgM0U80VlqbNtwRFc4ObHSCkVcH0W30hIzq8ZWckfIMjYxmftRIZ zaH2btv4yKaAGMZyqPg06BD4Z2b645xkwjR3Y= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlegroups.com; s=beta; h=x-beenthere:received-spf:from:to:cc:subject:date:message-id :x-mailer:in-reply-to:references:mime-version:x-sa-exim-connect-ip :x-sa-exim-mail-from:x-sa-exim-scanned:x-ptx-original-recipient :x-original-authentication-results:x-original-sender:reply-to :precedence:mailing-list:list-id:list-post:list-help:list-archive :x-thread-url:x-message-url:sender:list-subscribe:list-unsubscribe :content-type:content-transfer-encoding; b=4dRU5h81gfhqH1aJi1DCKUFMvD2v1DGBbwv7baBAOMaUZcRs3GfVJotjHsnZAPGX5B suOgH/KSWjPukIvh0ATOcVvINFdBq7LGPycE5Y7AxHSZjmVtDDdhGK0TPWa42QTExH7w 0TMJ6ulrV0Pn+sEAj2t2SMW+bOmN6Ct5tDOm4= Received: by 10.91.56.20 with SMTP id i20mr288632agk.11.1267440943326; Mon, 01 Mar 2010 02:55:43 -0800 (PST) X-BeenThere: rtc-linux@googlegroups.com Received: by 10.87.42.37 with SMTP id u37ls765620fgj.1.p; Mon, 01 Mar 2010 02:55:41 -0800 (PST) Received: by 10.87.74.29 with SMTP id b29mr144062fgl.26.1267440834864; Mon, 01 Mar 2010 02:53:54 -0800 (PST) Received: by 10.87.74.29 with SMTP id b29mr144061fgl.26.1267440834842; Mon, 01 Mar 2010 02:53:54 -0800 (PST) Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [92.198.50.35]) by gmr-mx.google.com with ESMTP id 12si397156fxm.0.2010.03.01.02.53.54; Mon, 01 Mar 2010 02:53:54 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of ukl@pengutronix.de designates 92.198.50.35 as permitted sender) client-ip=92.198.50.35; Received: from octopus.hi.pengutronix.de ([2001:6f8:1178:2:215:17ff:fe12:23b0]) by metis.ext.pengutronix.de with esmtp (Exim 4.69) (envelope-from ) id 1Nm3G6-0005Ge-BN; Mon, 01 Mar 2010 11:53:54 +0100 Received: from ukl by octopus.hi.pengutronix.de with local (Exim 4.69) (envelope-from ) id 1Nm3G6-0004gU-8b; Mon, 01 Mar 2010 11:53:54 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: linux-kernel@vger.kernel.org, rtc-linux@googlegroups.com Cc: Alessandro Zummo , Paul Gortmaker , Andrew Morton , Valentin Longchamp , Sascha Hauer Subject: [rtc-linux] [PATCH 3/6] rtc/mc13783: Don't use deprecated mc13783 API calls Date: Mon, 1 Mar 2010 11:53:42 +0100 Message-Id: <1267440825-14694-3-git-send-email-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 1.7.0 In-Reply-To: <1267440825-14694-1-git-send-email-u.kleine-koenig@pengutronix.de> References: <1267440825-14694-1-git-send-email-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 To: rtc-linux@googlegroups.com X-SA-Exim-Connect-IP: 2001:6f8:1178:2:215:17ff:fe12:23b0 X-SA-Exim-Mail-From: ukl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: rtc-linux@googlegroups.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: best guess record for domain of ukl@pengutronix.de designates 92.198.50.35 as permitted sender) smtp.mail=ukl@pengutronix.de X-Original-Sender: u.kleine-koenig@pengutronix.de 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: X-Thread-Url: http://groups.google.com/group/rtc-linux/t/27422cec32a1b315 X-Message-Url: http://groups.google.com/group/rtc-linux/msg/2fcf3c9ec84d5e22 Sender: rtc-linux@googlegroups.com List-Subscribe: , List-Unsubscribe: , mc13783_ackirq, mc13783_unmask and mc13783_mask are deprecated, use the drop in replacements with the nicer names. Signed-off-by: Uwe Kleine-König --- Hello, note this obviously depends on patch 1/6. Best regards Uwe drivers/rtc/rtc-mc13783.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/rtc/rtc-mc13783.c b/drivers/rtc/rtc-mc13783.c index 850f983..0a978a0 100644 --- a/drivers/rtc/rtc-mc13783.c +++ b/drivers/rtc/rtc-mc13783.c @@ -101,11 +101,11 @@ static int mc13783_rtc_set_mmss(struct device *dev, unsigned long secs) if (unlikely(ret)) goto out; - ret = mc13783_ackirq(priv->mc13783, MC13783_IRQ_RTCRST); + ret = mc13783_irq_ack(priv->mc13783, MC13783_IRQ_RTCRST); if (unlikely(ret)) goto out; - ret = mc13783_unmask(priv->mc13783, MC13783_IRQ_RTCRST); + ret = mc13783_irq_unmask(priv->mc13783, MC13783_IRQ_RTCRST); out: priv->valid = !ret; @@ -123,7 +123,7 @@ static irqreturn_t mc13783_rtc_update_handler(int irq, void *dev) rtc_update_irq(priv->rtc, 1, RTC_IRQF | RTC_UF); - mc13783_ackirq(mc13783, irq); + mc13783_irq_ack(mc13783, irq); return IRQ_HANDLED; } @@ -138,7 +138,7 @@ static int mc13783_rtc_update_irq_enable(struct device *dev, if (!priv->valid) goto out; - ret = (enabled ? mc13783_unmask : mc13783_mask)(priv->mc13783, + ret = (enabled ? mc13783_irq_unmask : mc13783_irq_mask)(priv->mc13783, MC13783_IRQ_1HZ); out: mc13783_unlock(priv->mc13783); @@ -160,7 +160,7 @@ static irqreturn_t mc13783_rtc_reset_handler(int irq, void *dev) dev_dbg(&priv->rtc->dev, "RTCRST\n"); priv->valid = 0; - mc13783_mask(mc13783, irq); + mc13783_irq_mask(mc13783, irq); return IRQ_HANDLED; }