linux-sh.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Schwinge <thomas@codesourcery.com>
To: linux-sh@vger.kernel.org
Subject: [PATCH 2/7] SH: heartbeat: restore big-endian operation.
Date: Fri, 09 Mar 2012 16:38:48 +0000	[thread overview]
Message-ID: <1331311133-26937-2-git-send-email-thomas@codesourcery.com> (raw)

As of 37b7a97884ba64bf7d403351ac2a9476ab4f1bba we have to use the
endianess-agnostic I/O accessor functions.

I have not tested this -- the board is situated in a remote data center.

Signed-off-by: Thomas Schwinge <thomas@codesourcery.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: linux-sh@vger.kernel.org
---
 arch/sh/drivers/heartbeat.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/sh/drivers/heartbeat.c b/arch/sh/drivers/heartbeat.c
index 7efc9c3..b8803fd 100644
--- a/arch/sh/drivers/heartbeat.c
+++ b/arch/sh/drivers/heartbeat.c
@@ -45,16 +45,16 @@ static inline void heartbeat_toggle_bit(struct heartbeat_data *hd,
 
 	switch (hd->regsize) {
 	case 32:
-		new |= ioread32(hd->base) & ~hd->mask;
-		iowrite32(new, hd->base);
+		new |= __raw_readl(hd->base) & ~hd->mask;
+		__raw_writel(new, hd->base);
 		break;
 	case 16:
-		new |= ioread16(hd->base) & ~hd->mask;
-		iowrite16(new, hd->base);
+		new |= __raw_readw(hd->base) & ~hd->mask;
+		__raw_writew(new, hd->base);
 		break;
 	default:
-		new |= ioread8(hd->base) & ~hd->mask;
-		iowrite8(new, hd->base);
+		new |= __raw_readb(hd->base) & ~hd->mask;
+		__raw_writeb(new, hd->base);
 		break;
 	}
 }
-- 
1.7.4.1


                 reply	other threads:[~2012-03-09 16:38 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1331311133-26937-2-git-send-email-thomas@codesourcery.com \
    --to=thomas@codesourcery.com \
    --cc=linux-sh@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).