From patchwork Fri Oct 22 22:01:54 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nobuhiro Iwamatsu X-Patchwork-Id: 68980 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-gw0-f56.google.com (mail-gw0-f56.google.com [74.125.83.56]) by ozlabs.org (Postfix) with ESMTP id 9E66BB70CB for ; Sat, 23 Oct 2010 08:57:55 +1100 (EST) Received: by gwb11 with SMTP id 11sf1727901gwb.11 for ; Fri, 22 Oct 2010 14:57:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=beta; h=domainkey-signature:received:mime-version:x-beenthere:received :received:received:received:received-spf:received:received:received :sender:received:from:to:cc:subject:date:message-id:x-mailer :x-original-sender:x-original-authentication-results:reply-to :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe:content-type; bh=MsAMVQsTxPuBXHv3ch2QdZw+z4m9COdiPHx3jyQwXAg=; b=3hFdGDwOzsP2e/ahPlpw6rRxHmb1IfGSO8RSzCllm9tjcW/GYhZqOKUoLHFk//INwP eOhbJQQ+OstqwCSgDeuc5oXidk4x2WeW9aVEKcTlGROEY9UJpxdykY4SCXEkZnEn64Ib CvU655NQIqolxjylsLLdwNvtMezxJ3bFj+mZk= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlegroups.com; s=beta; h=mime-version:x-beenthere:received-spf:sender:from:to:cc:subject :date:message-id:x-mailer:x-original-sender :x-original-authentication-results:reply-to:precedence:mailing-list :list-id:list-post:list-help:list-archive:list-subscribe :list-unsubscribe:content-type; b=QHRxkyYDv+HlK2PDKrs2OM4VRU/iw3+1ZC9o91eT0RxSqWrK+8vZf+kiFd2PiXOEw3 lJnEt2FkT2CiWdryYWFoj7vCjfAGb4i+UhpKVpm51pC710HE06JQx+hQp9eqyrjqFX6+ 9mF5yBtjZfqKDzlZhUxUEohI3oTD0e/B/g8ZQ= Received: by 10.151.135.12 with SMTP id m12mr588161ybn.53.1287784673480; Fri, 22 Oct 2010 14:57:53 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: rtc-linux@googlegroups.com Received: by 10.150.102.24 with SMTP id z24ls2214205ybb.3.p; Fri, 22 Oct 2010 14:57:53 -0700 (PDT) Received: by 10.151.157.3 with SMTP id j3mr1468880ybo.46.1287784673176; Fri, 22 Oct 2010 14:57:53 -0700 (PDT) Received: by 10.151.157.3 with SMTP id j3mr1468879ybo.46.1287784673148; Fri, 22 Oct 2010 14:57:53 -0700 (PDT) Received: from mail-yx0-f173.google.com (mail-yx0-f173.google.com [209.85.213.173]) by gmr-mx.google.com with ESMTP id u10si1851189yba.6.2010.10.22.14.57.52; Fri, 22 Oct 2010 14:57:52 -0700 (PDT) Received-SPF: pass (google.com: domain of iwamatsu@gmail.com designates 209.85.213.173 as permitted sender) client-ip=209.85.213.173; Received: by yxd5 with SMTP id 5so1169852yxd.18 for ; Fri, 22 Oct 2010 14:57:52 -0700 (PDT) Received: by 10.42.192.3 with SMTP id do3mr2488465icb.330.1287784671982; Fri, 22 Oct 2010 14:57:51 -0700 (PDT) Received: from chimagu (w142187.ppp.asahi-net.or.jp [121.1.142.187]) by mx.google.com with ESMTPS id w9sm3779897ibc.1.2010.10.22.14.57.49 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 22 Oct 2010 14:57:50 -0700 (PDT) Sender: rtc-linux@googlegroups.com Received: from iwamatsu by chimagu with local (Exim 4.72) (envelope-from ) id 1P9PgS-0001Uf-DL; Sat, 23 Oct 2010 07:01:56 +0900 From: Nobuhiro Iwamatsu To: rtc-linux@googlegroups.com Cc: linux-kernel@vger.kernel.org, Nobuhiro Iwamatsu Subject: [rtc-linux] [PATCH] rtc: rs5c313: Replase from ctrl_* to __raw_* Date: Sat, 23 Oct 2010 07:01:54 +0900 Message-Id: <1287784914-5714-1-git-send-email-iwamatsu@nigauri.org> X-Mailer: git-send-email 1.7.2.3 X-Original-Sender: iwamatsu@gmail.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of iwamatsu@gmail.com designates 209.85.213.173 as permitted sender) smtp.mail=iwamatsu@gmail.com; dkim=pass (test mode) header.i=@gmail.com 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: List-Subscribe: , List-Unsubscribe: , ctrl_* is deprecated. We should to use __raw_*. Signed-off-by: Nobuhiro Iwamatsu --- drivers/rtc/rtc-rs5c313.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/drivers/rtc/rtc-rs5c313.c b/drivers/rtc/rtc-rs5c313.c index e6ea3f5..49ec910 100644 --- a/drivers/rtc/rtc-rs5c313.c +++ b/drivers/rtc/rtc-rs5c313.c @@ -1,6 +1,6 @@ /* * Ricoh RS5C313 RTC device/driver - * Copyright (C) 2007 Nobuhiro Iwamatsu + * Copyright (C) 2007, 2010 Nobuhiro Iwamatsu * * 2005-09-19 modifed by kogiidena * @@ -80,21 +80,21 @@ /* SCSPTR1 data */ unsigned char scsptr1_data; -#define RS5C313_CEENABLE ctrl_outb(RS5C313_CE_RTCCE, RS5C313_CE); -#define RS5C313_CEDISABLE ctrl_outb(0x00, RS5C313_CE) -#define RS5C313_MISCOP ctrl_outb(0x02, 0xB0000008) +#define RS5C313_CEENABLE __raw_writeb(RS5C313_CE_RTCCE, RS5C313_CE); +#define RS5C313_CEDISABLE __raw_writeb(0x00, RS5C313_CE) +#define RS5C313_MISCOP __raw_writeb(0x02, 0xB0000008) static void rs5c313_init_port(void) { /* Set SCK as I/O port and Initialize SCSPTR1 data & I/O port. */ - ctrl_outb(ctrl_inb(SCSMR1) & ~SCSMR1_CA, SCSMR1); - ctrl_outb(ctrl_inb(SCSCR1) & ~SCSCR1_CKE, SCSCR1); + __raw_writeb(__raw_readb(SCSMR1) & ~SCSMR1_CA, SCSMR1); + __raw_writeb(__raw_readb(SCSCR1) & ~SCSCR1_CKE, SCSCR1); /* And Initialize SCL for RS5C313 clock */ - scsptr1_data = ctrl_inb(SCSPTR1) | SCL; /* SCL:H */ - ctrl_outb(scsptr1_data, SCSPTR1); - scsptr1_data = ctrl_inb(SCSPTR1) | SCL_OEN; /* SCL output enable */ - ctrl_outb(scsptr1_data, SCSPTR1); + scsptr1_data = __raw_readb(SCSPTR1) | SCL; /* SCL:H */ + __raw_writeb(scsptr1_data, SCSPTR1); + scsptr1_data = __raw_readb(SCSPTR1) | SCL_OEN; /* SCL output enable */ + __raw_writeb(scsptr1_data, SCSPTR1); RS5C313_CEDISABLE; /* CE:L */ } @@ -106,21 +106,21 @@ static void rs5c313_write_data(unsigned char data) /* SDA:Write Data */ scsptr1_data = (scsptr1_data & ~SDA) | ((((0x80 >> i) & data) >> (7 - i)) << 2); - ctrl_outb(scsptr1_data, SCSPTR1); + __raw_writeb(scsptr1_data, SCSPTR1); if (i == 0) { scsptr1_data |= SDA_OEN; /* SDA:output enable */ - ctrl_outb(scsptr1_data, SCSPTR1); + __raw_writeb(scsptr1_data, SCSPTR1); } ndelay(700); scsptr1_data &= ~SCL; /* SCL:L */ - ctrl_outb(scsptr1_data, SCSPTR1); + __raw_writeb(scsptr1_data, SCSPTR1); ndelay(700); scsptr1_data |= SCL; /* SCL:H */ - ctrl_outb(scsptr1_data, SCSPTR1); + __raw_writeb(scsptr1_data, SCSPTR1); } scsptr1_data &= ~SDA_OEN; /* SDA:output disable */ - ctrl_outb(scsptr1_data, SCSPTR1); + __raw_writeb(scsptr1_data, SCSPTR1); } static unsigned char rs5c313_read_data(void) @@ -131,12 +131,12 @@ static unsigned char rs5c313_read_data(void) for (i = 0; i < 8; i++) { ndelay(700); /* SDA:Read Data */ - data |= ((ctrl_inb(SCSPTR1) & SDA) >> 2) << (7 - i); + data |= ((__raw_readb(SCSPTR1) & SDA) >> 2) << (7 - i); scsptr1_data &= ~SCL; /* SCL:L */ - ctrl_outb(scsptr1_data, SCSPTR1); + __raw_writeb(scsptr1_data, SCSPTR1); ndelay(700); scsptr1_data |= SCL; /* SCL:H */ - ctrl_outb(scsptr1_data, SCSPTR1); + __raw_writeb(scsptr1_data, SCSPTR1); } return data & 0x0F; }