From patchwork Tue Oct 26 03:07:39 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nobuhiro Iwamatsu X-Patchwork-Id: 69160 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 21CBEB70AF for ; Tue, 26 Oct 2010 14:03:29 +1100 (EST) Received: by pwi5 with SMTP id 5sf1407294pwi.11 for ; Mon, 25 Oct 2010 20:03:28 -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=RF6WswWrHkUf/gBSxTEXxVmGBVQbielhHbpA5sRBkLg=; b=n+U8EBdDUaZ4yTDQemuOLiTgtP1F0uqmRBlNLlVPdTO1zN907FOUZn0jebQtRhsWsW cw56vi7VnrM8lIdsk5OBZJWYWJnOL1vV4KoH7xsNiDNv1/MQCbfx9vEguLH6m30Tfpet qN62rbDoasnIBHF/K3KYgsWYLZPYNr/S3NbKY= 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=M9yoveq+t/2VUIAvpKrBv7HII04LFb31acAYTmxRvArJDPylq5O8u2r3le23/bA/lV 2I5WUZ7GOW1EgBSWDryOAUmVjS5VT9fBpiQsUsEV3S9LNd2FNZAEx4WHurSs+Q3BUAo6 +0XjifeO8M1mmBHOZl+OQaWbargE2VK34Z5PY= Received: by 10.142.250.38 with SMTP id x38mr354672wfh.59.1288062207290; Mon, 25 Oct 2010 20:03:27 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: rtc-linux@googlegroups.com Received: by 10.142.6.9 with SMTP id 9ls9848523wff.3.p; Mon, 25 Oct 2010 20:03:27 -0700 (PDT) Received: by 10.142.155.16 with SMTP id c16mr3045615wfe.6.1288062206969; Mon, 25 Oct 2010 20:03:26 -0700 (PDT) Received: by 10.142.155.16 with SMTP id c16mr3045614wfe.6.1288062206937; Mon, 25 Oct 2010 20:03:26 -0700 (PDT) Received: from mail-pv0-f172.google.com (mail-pv0-f172.google.com [74.125.83.172]) by gmr-mx.google.com with ESMTP id h6si17845983wfj.1.2010.10.25.20.03.25; Mon, 25 Oct 2010 20:03:25 -0700 (PDT) Received-SPF: pass (google.com: domain of iwamatsu@gmail.com designates 74.125.83.172 as permitted sender) client-ip=74.125.83.172; Received: by pva18 with SMTP id 18so1007891pva.17 for ; Mon, 25 Oct 2010 20:03:25 -0700 (PDT) Received: by 10.142.223.11 with SMTP id v11mr5826578wfg.407.1288062205828; Mon, 25 Oct 2010 20:03:25 -0700 (PDT) Received: from chimagu (49.14.32.202.bf.2iij.net [202.32.14.49]) by mx.google.com with ESMTPS id e36sm12455255wfj.14.2010.10.25.20.03.24 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 25 Oct 2010 20:03:25 -0700 (PDT) Sender: rtc-linux@googlegroups.com Received: from iwamatsu by chimagu with local (Exim 4.72) (envelope-from ) id 1PAZsy-0003iS-S3; Tue, 26 Oct 2010 12:07:40 +0900 From: Nobuhiro Iwamatsu To: rtc-linux@googlegroups.com Cc: Nobuhiro Iwamatsu Subject: [rtc-linux] [PATCH v2] rtc: rs5c313: Replase from ctrl_X to readX/writeX Date: Tue, 26 Oct 2010 12:07:39 +0900 Message-Id: <1288062459-14256-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 74.125.83.172 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. This replase from __raw_X to readX/writeX Signed-off-by: Nobuhiro Iwamatsu --- drivers/rtc/rtc-rs5c313.c | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/drivers/rtc/rtc-rs5c313.c b/drivers/rtc/rtc-rs5c313.c index e6ea3f5..4febd4c 100644 --- a/drivers/rtc/rtc-rs5c313.c +++ b/drivers/rtc/rtc-rs5c313.c @@ -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 writeb(RS5C313_CE_RTCCE, RS5C313_CE); +#define RS5C313_CEDISABLE writeb(0x00, RS5C313_CE) +#define RS5C313_MISCOP 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); + writeb(readb(SCSMR1) & ~SCSMR1_CA, SCSMR1); + writeb(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 = readb(SCSPTR1) | SCL; /* SCL:H */ + writeb(scsptr1_data, SCSPTR1); + scsptr1_data = readb(SCSPTR1) | SCL_OEN; /* SCL output enable */ + 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); + writeb(scsptr1_data, SCSPTR1); if (i == 0) { scsptr1_data |= SDA_OEN; /* SDA:output enable */ - ctrl_outb(scsptr1_data, SCSPTR1); + writeb(scsptr1_data, SCSPTR1); } ndelay(700); scsptr1_data &= ~SCL; /* SCL:L */ - ctrl_outb(scsptr1_data, SCSPTR1); + writeb(scsptr1_data, SCSPTR1); ndelay(700); scsptr1_data |= SCL; /* SCL:H */ - ctrl_outb(scsptr1_data, SCSPTR1); + writeb(scsptr1_data, SCSPTR1); } scsptr1_data &= ~SDA_OEN; /* SDA:output disable */ - ctrl_outb(scsptr1_data, SCSPTR1); + 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 |= ((readb(SCSPTR1) & SDA) >> 2) << (7 - i); scsptr1_data &= ~SCL; /* SCL:L */ - ctrl_outb(scsptr1_data, SCSPTR1); + writeb(scsptr1_data, SCSPTR1); ndelay(700); scsptr1_data |= SCL; /* SCL:H */ - ctrl_outb(scsptr1_data, SCSPTR1); + writeb(scsptr1_data, SCSPTR1); } return data & 0x0F; }