From patchwork Wed Nov 18 15:30:39 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alessandro Zummo X-Patchwork-Id: 38759 Return-Path: <3IBMESw0MCYIg50ssu-muumrkzu2kxzkin.ozxzi-rot03muumrkmxu0vy.ius@groups.bounces.google.com> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-yw0-f159.google.com (mail-yw0-f159.google.com [209.85.211.159]) by ozlabs.org (Postfix) with ESMTP id 6C2FBB6EF7 for ; Thu, 19 Nov 2009 02:30:41 +1100 (EST) Received: by mail-yw0-f159.google.com with SMTP id 31sf1909941ywh.29 for ; Wed, 18 Nov 2009 07:30:41 -0800 (PST) Received: by 10.91.163.7 with SMTP id q7mr231927ago.8.1258558240839; Wed, 18 Nov 2009 07:30:40 -0800 (PST) X-BeenThere: rtc-linux@googlegroups.com Received: by 10.204.151.83 with SMTP id b19ls5999533bkw.2.p; Wed, 18 Nov 2009 07:30:39 -0800 (PST) Received: by 10.204.35.15 with SMTP id n15mr391777bkd.20.1258558239706; Wed, 18 Nov 2009 07:30:39 -0800 (PST) Received: by 10.204.35.15 with SMTP id n15mr391776bkd.20.1258558239668; Wed, 18 Nov 2009 07:30:39 -0800 (PST) Received: from elettra.colt-to.towertech.it (elettra.colt-to.towertech.it [213.215.222.70]) by gmr-mx.google.com with ESMTP id 18si16651bwz.9.2009.11.18.07.30.39; Wed, 18 Nov 2009 07:30:39 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of a.zummo@towertech.it designates 213.215.222.70 as permitted sender) client-ip=213.215.222.70; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: best guess record for domain of a.zummo@towertech.it designates 213.215.222.70 as permitted sender) smtp.mail=a.zummo@towertech.it Received: from linux.lan.towertech.it (93-39-51-125.ip74.fastwebnet.it [93.39.51.125]) by elettra.colt-to.towertech.it (Postfix) with ESMTPA id 3CB6E116641; Wed, 18 Nov 2009 16:30:39 +0100 (CET) Subject: [rtc-linux] [PATCH 6/7] rtc: Remove __raw_* accessors from PL031 RTC To: akpm@linux-foundation.org From: Alessandro Zummo Cc: Linus Walleij , rtc-linux@googlegroups.com Date: Wed, 18 Nov 2009 16:30:39 +0100 Message-ID: <20091118153038.24824.51571.stgit@linux.lan.towertech.it> In-Reply-To: <20091118153010.24824.14155.stgit@linux.lan.towertech.it> References: <20091118153010.24824.14155.stgit@linux.lan.towertech.it> User-Agent: StGit/0.15 MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.95.2 at elettra X-Virus-Status: Clean 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/3d37b7123be786a4 X-Message-Url: http://groups.google.com/group/rtc-linux/msg/3f6380855a32e65b From: Linus Walleij This switches __raw_[read|write]l() for plain [read|write]l in the PL031 RTC driver. The sister driver for PL030 use the simple accessors as most PrimeCell drivers. Signed-off-by: Linus Walleij Signed-off-by: Alessandro Zummo patch-name: 38221-rtc-pl031-fix-accessort patch-rev1: f50c52ad7f6f8be4f899e8780486f73b93760a56 patch-rev2: 1bb5545a284e34fad8f7cd6ced35fd9ecb3f51d4 --- drivers/rtc/rtc-pl031.c | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/drivers/rtc/rtc-pl031.c b/drivers/rtc/rtc-pl031.c index f41873f..0264b11 100644 --- a/drivers/rtc/rtc-pl031.c +++ b/drivers/rtc/rtc-pl031.c @@ -51,10 +51,10 @@ static int pl031_ioctl(struct device *dev, unsigned int cmd, unsigned long arg) switch (cmd) { case RTC_AIE_OFF: - __raw_writel(1, ldata->base + RTC_MIS); + writel(1, ldata->base + RTC_MIS); return 0; case RTC_AIE_ON: - __raw_writel(0, ldata->base + RTC_MIS); + writel(0, ldata->base + RTC_MIS); return 0; } @@ -65,7 +65,7 @@ static int pl031_read_time(struct device *dev, struct rtc_time *tm) { struct pl031_local *ldata = dev_get_drvdata(dev); - rtc_time_to_tm(__raw_readl(ldata->base + RTC_DR), tm); + rtc_time_to_tm(readl(ldata->base + RTC_DR), tm); return 0; } @@ -76,7 +76,7 @@ static int pl031_set_time(struct device *dev, struct rtc_time *tm) struct pl031_local *ldata = dev_get_drvdata(dev); rtc_tm_to_time(tm, &time); - __raw_writel(time, ldata->base + RTC_LR); + writel(time, ldata->base + RTC_LR); return 0; } @@ -85,9 +85,9 @@ static int pl031_read_alarm(struct device *dev, struct rtc_wkalrm *alarm) { struct pl031_local *ldata = dev_get_drvdata(dev); - rtc_time_to_tm(__raw_readl(ldata->base + RTC_MR), &alarm->time); - alarm->pending = __raw_readl(ldata->base + RTC_RIS); - alarm->enabled = __raw_readl(ldata->base + RTC_IMSC); + rtc_time_to_tm(readl(ldata->base + RTC_MR), &alarm->time); + alarm->pending = readl(ldata->base + RTC_RIS); + alarm->enabled = readl(ldata->base + RTC_IMSC); return 0; } @@ -99,8 +99,8 @@ static int pl031_set_alarm(struct device *dev, struct rtc_wkalrm *alarm) rtc_tm_to_time(&alarm->time, &time); - __raw_writel(time, ldata->base + RTC_MR); - __raw_writel(!alarm->enabled, ldata->base + RTC_MIS); + writel(time, ldata->base + RTC_MR); + writel(!alarm->enabled, ldata->base + RTC_MIS); return 0; } @@ -180,8 +180,9 @@ err_req: static struct amba_id pl031_ids[] __initdata = { { - .id = 0x00041031, - .mask = 0x000fffff, }, + .id = 0x00041031, + .mask = 0x000fffff, + }, {0, 0}, };