From patchwork Fri Oct 22 22:07:00 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nobuhiro Iwamatsu X-Patchwork-Id: 278121 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o9MM2wrU024546 for ; Fri, 22 Oct 2010 22:03:00 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752371Ab0JVWC5 (ORCPT ); Fri, 22 Oct 2010 18:02:57 -0400 Received: from mail-iw0-f174.google.com ([209.85.214.174]:41051 "EHLO mail-iw0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752113Ab0JVWC4 (ORCPT ); Fri, 22 Oct 2010 18:02:56 -0400 Received: by iwn34 with SMTP id 34so1406728iwn.19 for ; Fri, 22 Oct 2010 15:02:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:received:from:to:cc :subject:date:message-id:x-mailer; bh=AWo3I3tFGz6mbhDrZjR5Si/AErQirNrfKyGK/osMrQs=; b=GduWOmd6r4U76dvWfk2DA37/zKEfjA6y+fkj4wurTXpsLR5ub/t+F1Z2BbAzLl08tb 73sdGXRTJRjsuyuZZY+BmUhWJF3kcJfAy1RmKc4tMIPsYHYeJGwnUuMncaKp1q4naXdw vSUXKipFEgZ16zAmexkeFpFU/L67HtDfZICt8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer; b=ckDlcfeborRSpnjJKiRa8ep0MdxEATTMk8bowwsAaIRh3qSfA+Nm+0W5HlSRaA4P4V gWuVySIsJ2w4QzezWtTJ7hZvhXsmi6JNCE4H086jPamIq6eRl8bIpexoXSypc5up/ETE wldSkL54kCu+zt5i3g1lz62yMv0qUA0+kUb+M= Received: by 10.231.33.132 with SMTP id h4mr3148493ibd.150.1287784975769; Fri, 22 Oct 2010 15:02:55 -0700 (PDT) Received: from chimagu (w142187.ppp.asahi-net.or.jp [121.1.142.187]) by mx.google.com with ESMTPS id 8sm3809923iba.22.2010.10.22.15.02.54 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 22 Oct 2010 15:02:55 -0700 (PDT) Received: from iwamatsu by chimagu with local (Exim 4.72) (envelope-from ) id 1P9PlN-0001XZ-Iv; Sat, 23 Oct 2010 07:07:01 +0900 From: Nobuhiro Iwamatsu To: linux-i2c@vger.kernel.org Cc: linux-sh@vger.kernel.org, Nobuhiro Iwamatsu Subject: [PATCH] sh: i2c-sh7760: Replase from ctrl_* to __raw_* Date: Sat, 23 Oct 2010 07:07:00 +0900 Message-Id: <1287785220-5893-1-git-send-email-iwamatsu@nigauri.org> X-Mailer: git-send-email 1.7.2.3 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Fri, 22 Oct 2010 22:03:01 +0000 (UTC) diff --git a/drivers/i2c/busses/i2c-sh7760.c b/drivers/i2c/busses/i2c-sh7760.c index 4f93da3..3cad8fe 100644 --- a/drivers/i2c/busses/i2c-sh7760.c +++ b/drivers/i2c/busses/i2c-sh7760.c @@ -101,12 +101,12 @@ struct cami2c { static inline void OUT32(struct cami2c *cam, int reg, unsigned long val) { - ctrl_outl(val, (unsigned long)cam->iobase + reg); + __raw_writel(val, (unsigned long)cam->iobase + reg); } static inline unsigned long IN32(struct cami2c *cam, int reg) { - return ctrl_inl((unsigned long)cam->iobase + reg); + return __raw_readl((unsigned long)cam->iobase + reg); } static irqreturn_t sh7760_i2c_irq(int irq, void *ptr)