All of lore.kernel.org
 help / color / mirror / Atom feed
From: Harvey Harrison <harvey.harrison@gmail.com>
To: David Miller <davem@davemloft.net>
Cc: sparclinux <sparclinux@vger.kernel.org>,
	LKML <linux-kernel@vger.kernel.org>,
	Andrew Morton <akpm@linux-foundation.org>
Subject: [PATCH] sparc64: Annotate pointers in PeeCeeI.c
Date: Thu, 16 Oct 2008 00:15:19 +0000	[thread overview]
Message-ID: <1224116119.5815.11.camel@brick> (raw)

This has no functional changes, but annotates the code to make
the endianness more clear.  In addition, removes some of the only
users of cpu_to_le[16|32]p in the kernel.

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
---
 arch/sparc64/lib/PeeCeeI.c |   34 +++++++++++++++++-----------------
 1 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/arch/sparc64/lib/PeeCeeI.c b/arch/sparc64/lib/PeeCeeI.c
index 8b313f1..e609b65 100644
--- a/arch/sparc64/lib/PeeCeeI.c
+++ b/arch/sparc64/lib/PeeCeeI.c
@@ -53,32 +53,32 @@ void outsl(unsigned long __addr, const void *src, unsigned long count)
 
 	if (count) {
 		if ((((u64)src) & 0x3) = 0) {
-			u32 *p = (u32 *)src;
+			__le32 *p = (__le32 *)src;
 			while (count--) {
-				u32 val = cpu_to_le32p(p);
+				u32 val = le32_to_cpup(p);
 				outl(val, addr);
 				p++;
 			}
 		} else {
 			u8 *pb;
-			u16 *ps = (u16 *)src;
+			__le16 *ps = (__le16 *)src;
 			u32 l = 0, l2;
-			u32 *pi;
+			__le32 *pi;
 
 			switch (((u64)src) & 0x3) {
 			case 0x2:
 				count -= 1;
-				l = cpu_to_le16p(ps) << 16;
+				l = le16_to_cpup(ps) << 16;
 				ps++;
-				pi = (u32 *)ps;
+				pi = (__le32 *)ps;
 				while (count--) {
-					l2 = cpu_to_le32p(pi);
+					l2 = le32_to_cpup(pi);
 					pi++;
 					outl(((l >> 16) | (l2 << 16)), addr);
 					l = l2;
 				}
-				ps = (u16 *)pi;
-				l2 = cpu_to_le16p(ps);
+				ps = (__le16 *)pi;
+				l2 = le16_to_cpup(ps);
 				outl(((l >> 16) | (l2 << 16)), addr);
 				break;
 
@@ -86,13 +86,13 @@ void outsl(unsigned long __addr, const void *src, unsigned long count)
 				count -= 1;
 				pb = (u8 *)src;
 				l = (*pb++ << 8);
-				ps = (u16 *)pb;
-				l2 = cpu_to_le16p(ps);
+				ps = (__le16 *)pb;
+				l2 = le16p_to_cpup(ps);
 				ps++;
 				l |= (l2 << 16);
-				pi = (u32 *)ps;
+				pi = (__le32 *)ps;
 				while (count--) {
-					l2 = cpu_to_le32p(pi);
+					l2 = le32_to_cpup(pi);
 					pi++;
 					outl(((l >> 8) | (l2 << 24)), addr);
 					l = l2;
@@ -105,15 +105,15 @@ void outsl(unsigned long __addr, const void *src, unsigned long count)
 				count -= 1;
 				pb = (u8 *)src;
 				l = (*pb++ << 24);
-				pi = (u32 *)pb;
+				pi = (__le32 *)pb;
 				while (count--) {
-					l2 = cpu_to_le32p(pi);
+					l2 = le32_to_cpup(pi);
 					pi++;
 					outl(((l >> 24) | (l2 << 8)), addr);
 					l = l2;
 				}
-				ps = (u16 *)pi;
-				l2 = cpu_to_le16p(ps);
+				ps = (__le16 *)pi;
+				l2 = le16_to_cpup(ps);
 				ps++;
 				pb = (u8 *)ps;
 				l2 |= (*pb << 16);
-- 
1.6.0.2.711.gf1ba4




WARNING: multiple messages have this Message-ID (diff)
From: Harvey Harrison <harvey.harrison@gmail.com>
To: David Miller <davem@davemloft.net>
Cc: sparclinux <sparclinux@vger.kernel.org>,
	LKML <linux-kernel@vger.kernel.org>,
	Andrew Morton <akpm@linux-foundation.org>
Subject: [PATCH] sparc64: Annotate pointers in PeeCeeI.c
Date: Wed, 15 Oct 2008 17:15:19 -0700	[thread overview]
Message-ID: <1224116119.5815.11.camel@brick> (raw)

This has no functional changes, but annotates the code to make
the endianness more clear.  In addition, removes some of the only
users of cpu_to_le[16|32]p in the kernel.

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
---
 arch/sparc64/lib/PeeCeeI.c |   34 +++++++++++++++++-----------------
 1 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/arch/sparc64/lib/PeeCeeI.c b/arch/sparc64/lib/PeeCeeI.c
index 8b313f1..e609b65 100644
--- a/arch/sparc64/lib/PeeCeeI.c
+++ b/arch/sparc64/lib/PeeCeeI.c
@@ -53,32 +53,32 @@ void outsl(unsigned long __addr, const void *src, unsigned long count)
 
 	if (count) {
 		if ((((u64)src) & 0x3) == 0) {
-			u32 *p = (u32 *)src;
+			__le32 *p = (__le32 *)src;
 			while (count--) {
-				u32 val = cpu_to_le32p(p);
+				u32 val = le32_to_cpup(p);
 				outl(val, addr);
 				p++;
 			}
 		} else {
 			u8 *pb;
-			u16 *ps = (u16 *)src;
+			__le16 *ps = (__le16 *)src;
 			u32 l = 0, l2;
-			u32 *pi;
+			__le32 *pi;
 
 			switch (((u64)src) & 0x3) {
 			case 0x2:
 				count -= 1;
-				l = cpu_to_le16p(ps) << 16;
+				l = le16_to_cpup(ps) << 16;
 				ps++;
-				pi = (u32 *)ps;
+				pi = (__le32 *)ps;
 				while (count--) {
-					l2 = cpu_to_le32p(pi);
+					l2 = le32_to_cpup(pi);
 					pi++;
 					outl(((l >> 16) | (l2 << 16)), addr);
 					l = l2;
 				}
-				ps = (u16 *)pi;
-				l2 = cpu_to_le16p(ps);
+				ps = (__le16 *)pi;
+				l2 = le16_to_cpup(ps);
 				outl(((l >> 16) | (l2 << 16)), addr);
 				break;
 
@@ -86,13 +86,13 @@ void outsl(unsigned long __addr, const void *src, unsigned long count)
 				count -= 1;
 				pb = (u8 *)src;
 				l = (*pb++ << 8);
-				ps = (u16 *)pb;
-				l2 = cpu_to_le16p(ps);
+				ps = (__le16 *)pb;
+				l2 = le16p_to_cpup(ps);
 				ps++;
 				l |= (l2 << 16);
-				pi = (u32 *)ps;
+				pi = (__le32 *)ps;
 				while (count--) {
-					l2 = cpu_to_le32p(pi);
+					l2 = le32_to_cpup(pi);
 					pi++;
 					outl(((l >> 8) | (l2 << 24)), addr);
 					l = l2;
@@ -105,15 +105,15 @@ void outsl(unsigned long __addr, const void *src, unsigned long count)
 				count -= 1;
 				pb = (u8 *)src;
 				l = (*pb++ << 24);
-				pi = (u32 *)pb;
+				pi = (__le32 *)pb;
 				while (count--) {
-					l2 = cpu_to_le32p(pi);
+					l2 = le32_to_cpup(pi);
 					pi++;
 					outl(((l >> 24) | (l2 << 8)), addr);
 					l = l2;
 				}
-				ps = (u16 *)pi;
-				l2 = cpu_to_le16p(ps);
+				ps = (__le16 *)pi;
+				l2 = le16_to_cpup(ps);
 				ps++;
 				pb = (u8 *)ps;
 				l2 |= (*pb << 16);
-- 
1.6.0.2.711.gf1ba4




             reply	other threads:[~2008-10-16  0:15 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-10-16  0:15 Harvey Harrison [this message]
2008-10-16  0:15 ` [PATCH] sparc64: Annotate pointers in PeeCeeI.c Harvey Harrison
2008-10-16  0:23 ` David Miller
2008-10-16  0:23   ` David Miller
2008-10-16  0:32   ` Harvey Harrison
2008-10-16  0:32     ` Harvey Harrison

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=1224116119.5815.11.camel@brick \
    --to=harvey.harrison@gmail.com \
    --cc=akpm@linux-foundation.org \
    --cc=davem@davemloft.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=sparclinux@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.