Skip to contentSkip to conversation

Remove all users of cpu_to_{le|be}{16|32|64}p

PATCH In review Harvey Harrison 3 participants 3 messages May 20, 2008 – May 21, 2008

Subsystems (7)
Network drivers USB I2C subsystem host drivers USB networking drivers +3 more subsystems
lore
Share & tools
lore

Harvey Harrison

author
#0 lore raw

PATCH 1/2 Remove all users of cpu_to_{le|be}{16|32|64}p

Signed-off-by Harvey Harrison <[email protected]>

---
akpm: applies on top of the 21-patch aligned get/put helpers series.

 arch/sparc64/lib/PeeCeeI.c      |   16 ++++++++--------
 drivers/i2c/busses/i2c-pmcmsp.c |    2 +-
 drivers/isdn/hisax/st5481_usb.c |    4 ++--
 drivers/net/usb/kaweth.c        |    6 +++---
 drivers/net/usb/pegasus.c       |   12 ++++++------
 drivers/usb/class/cdc-acm.c     |    5 +++--
 drivers/usb/core/message.c      |    6 +++---
 drivers/usb/gadget/net2280.c    |    2 +-
 drivers/usb/host/ohci.h         |    8 ++------
 9 files changed, 29 insertions(+), 32 deletions(-)
arch/sparc64/lib/PeeCeeI.c +8 -8
index f85a50f..a00686f 100644
@@ -55,7 +55,7 @@ void outsl(unsigned long __addr, const void *src, unsigned long count)
 		if ((((u64)src) & 0x3) == 0) {
 			u32 *p = (u32 *)src;
 			while (count--) {
-				u32 val = cpu_to_le32p(p);
+				u32 val = cpu_to_le32(*p);
 				outl(val, addr);
 				p++;
 			}

@@ -68,17 +68,17 @@ void outsl(unsigned long __addr, const void *src, unsigned long count)
 			switch (((u64)src) & 0x3) {
 			case 0x2:
 				count -= 1;
-				l = cpu_to_le16p(ps) << 16;
+				l = cpu_to_le16(*ps) << 16;
 				ps++;
 				pi = (u32 *)ps;
 				while (count--) {
-					l2 = cpu_to_le32p(pi);
+					l2 = cpu_to_le32(*pi);
 					pi++;
 					outl(((l >> 16) | (l2 << 16)), addr);
 					l = l2;
 				}
 				ps = (u16 *)pi;
-				l2 = cpu_to_le16p(ps);
+				l2 = cpu_to_le16(*ps);
 				outl(((l >> 16) | (l2 << 16)), addr);
 				break;
 

@@ -87,12 +87,12 @@ void outsl(unsigned long __addr, const void *src, unsigned long count)
 				pb = (u8 *)src;
 				l = (*pb++ << 8);
 				ps = (u16 *)pb;
-				l2 = cpu_to_le16p(ps);
+				l2 = cpu_to_le16(*ps);
 				ps++;
 				l |= (l2 << 16);
 				pi = (u32 *)ps;
 				while (count--) {
-					l2 = cpu_to_le32p(pi);
+					l2 = cpu_to_le32(*pi);
 					pi++;
 					outl(((l >> 8) | (l2 << 24)), addr);
 					l = l2;

@@ -107,13 +107,13 @@ void outsl(unsigned long __addr, const void *src, unsigned long count)
 				l = (*pb++ << 24);
 				pi = (u32 *)pb;
 				while (count--) {
-					l2 = cpu_to_le32p(pi);
+					l2 = cpu_to_le32(*pi);
 					pi++;
 					outl(((l >> 24) | (l2 << 8)), addr);
 					l = l2;
 				}
 				ps = (u16 *)pi;
-				l2 = cpu_to_le16p(ps);
+				l2 = cpu_to_le16(*ps);
 				ps++;
 				pb = (u8 *)ps;
 				l2 |= (*pb << 16);
drivers/i2c/busses/i2c-pmcmsp.c +1 -1
index 63b3e2c..977eb55 100644
@@ -486,7 +486,7 @@ static enum pmcmsptwi_xfer_result pmcmsptwi_xfer_cmd(
 
 	if (cmd->type == MSP_TWI_CMD_WRITE ||
 	    cmd->type == MSP_TWI_CMD_WRITE_READ) {
-		__be64 tmp = cpu_to_be64p((u64 *)cmd->write_data);
+		__be64 tmp = cpu_to_be64(*(u64 *)cmd->write_data);
 		tmp >>= (MSP_MAX_BYTES_PER_RW - cmd->write_len) * 8;
 		dev_dbg(&pmcmsptwi_adapter.dev, "Writing 0x%016llx\n", tmp);
 		pmcmsptwi_writel(tmp & 0x00000000ffffffffLL,
drivers/isdn/hisax/st5481_usb.c +2 -2
index 427a8b0..4639c02 100644
@@ -73,8 +73,8 @@ static void usb_ctrl_msg(struct st5481_adapter *adapter,
    
 	ctrl_msg->dr.bRequestType = requesttype;
 	ctrl_msg->dr.bRequest = request;
-	ctrl_msg->dr.wValue = cpu_to_le16p(&value);
-	ctrl_msg->dr.wIndex = cpu_to_le16p(&index);
+	ctrl_msg->dr.wValue = cpu_to_le16(value);
+	ctrl_msg->dr.wIndex = cpu_to_le16(index);
 	ctrl_msg->dr.wLength = 0;
 	ctrl_msg->complete = complete;
 	ctrl_msg->context = context;
drivers/net/usb/kaweth.c +3 -3
index 0cff7e1..b50c022 100644
@@ -280,9 +280,9 @@ static int kaweth_control(struct kaweth_device *kaweth,
 
 	dr->bRequestType= requesttype;
 	dr->bRequest = request;
-	dr->wValue = cpu_to_le16p(&value);
-	dr->wIndex = cpu_to_le16p(&index);
-	dr->wLength = cpu_to_le16p(&size);
+	dr->wValue = cpu_to_le16(value);
+	dr->wIndex = cpu_to_le16(index);
+	dr->wLength = cpu_to_le16(size);
 
 	return kaweth_internal_control_msg(kaweth->dev,
 					pipe,
drivers/net/usb/pegasus.c +6 -6
index 2a4f981..d7043af 100644
@@ -149,8 +149,8 @@ static int get_registers(pegasus_t * pegasus, __u16 indx, __u16 size,
 	pegasus->dr.bRequestType = PEGASUS_REQT_READ;
 	pegasus->dr.bRequest = PEGASUS_REQ_GET_REGS;
 	pegasus->dr.wValue = cpu_to_le16(0);
-	pegasus->dr.wIndex = cpu_to_le16p(&indx);
-	pegasus->dr.wLength = cpu_to_le16p(&size);
+	pegasus->dr.wIndex = cpu_to_le16(indx);
+	pegasus->dr.wLength = cpu_to_le16(size);
 	pegasus->ctrl_urb->transfer_buffer_length = size;
 
 	usb_fill_control_urb(pegasus->ctrl_urb, pegasus->usb,

@@ -207,8 +207,8 @@ static int set_registers(pegasus_t * pegasus, __u16 indx, __u16 size,
 	pegasus->dr.bRequestType = PEGASUS_REQT_WRITE;
 	pegasus->dr.bRequest = PEGASUS_REQ_SET_REGS;
 	pegasus->dr.wValue = cpu_to_le16(0);
-	pegasus->dr.wIndex = cpu_to_le16p(&indx);
-	pegasus->dr.wLength = cpu_to_le16p(&size);
+	pegasus->dr.wIndex = cpu_to_le16(indx);
+	pegasus->dr.wLength = cpu_to_le16(size);
 	pegasus->ctrl_urb->transfer_buffer_length = size;
 
 	usb_fill_control_urb(pegasus->ctrl_urb, pegasus->usb,

@@ -260,7 +260,7 @@ static int set_register(pegasus_t * pegasus, __u16 indx, __u8 data)
 	pegasus->dr.bRequestType = PEGASUS_REQT_WRITE;
 	pegasus->dr.bRequest = PEGASUS_REQ_SET_REG;
 	pegasus->dr.wValue = cpu_to_le16(data);
-	pegasus->dr.wIndex = cpu_to_le16p(&indx);
+	pegasus->dr.wIndex = cpu_to_le16(indx);
 	pegasus->dr.wLength = cpu_to_le16(1);
 	pegasus->ctrl_urb->transfer_buffer_length = 1;
 

@@ -475,7 +475,7 @@ static inline void get_node_id(pegasus_t * pegasus, __u8 * id)
 
 	for (i = 0; i < 3; i++) {
 		read_eprom_word(pegasus, i, &w16);
-		((__le16 *) id)[i] = cpu_to_le16p(&w16);
+		((__le16 *)id)[i] = cpu_to_le16(w16);
 	}
 }
drivers/usb/class/cdc-acm.c +3 -2
index 63c3404..93310c0 100644
@@ -736,8 +736,9 @@ static void acm_tty_set_termios(struct tty_struct *tty, struct ktermios *termios
 	if (!ACM_READY(acm))
 		return;
 
-	newline.dwDTERate = cpu_to_le32p(acm_tty_speed +
-		(termios->c_cflag & CBAUD & ~CBAUDEX) + (termios->c_cflag & CBAUDEX ? 15 : 0));
+	newline.dwDTERate = cpu_to_le32(acm_tty_speed[
+			    (termios->c_cflag & CBAUD & ~CBAUDEX) +
+			    (termios->c_cflag & CBAUDEX ? 15 : 0)]);
 	newline.bCharFormat = termios->c_cflag & CSTOPB ? 2 : 0;
 	newline.bParityType = termios->c_cflag & PARENB ?
 		(termios->c_cflag & PARODD ? 1 : 2) + (termios->c_cflag & CMSPAR ? 2 : 0) : 0;
drivers/usb/core/message.c +3 -3
index fe47d14..d260b5f 100644
@@ -139,9 +139,9 @@ int usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
 
 	dr->bRequestType = requesttype;
 	dr->bRequest = request;
-	dr->wValue = cpu_to_le16p(&value);
-	dr->wIndex = cpu_to_le16p(&index);
-	dr->wLength = cpu_to_le16p(&size);
+	dr->wValue = cpu_to_le16(value);
+	dr->wIndex = cpu_to_le16(index);
+	dr->wLength = cpu_to_le16(size);
 
 	/* dbg("usb_control_msg"); */
drivers/usb/gadget/net2280.c +1 -1
index cb8a3ab..37e5f2e 100644
@@ -668,7 +668,7 @@ fill_dma_desc (struct net2280_ep *ep, struct net2280_request *req, int valid)
 
 	/* 2280 may be polling VALID_BIT through ep->dma->dmadesc */
 	wmb ();
-	td->dmacount = cpu_to_le32p (&dmacount);
+	td->dmacount = cpu_to_le32(dmacount);
 }
 
 static const u32 dmactl_default =
drivers/usb/host/ohci.h +2 -6
index a1b55dc..79f7406 100644
@@ -588,9 +588,7 @@ static inline __hc16 cpu_to_hc16 (const struct ohci_hcd *ohci, const u16 x)
 
 static inline __hc16 cpu_to_hc16p (const struct ohci_hcd *ohci, const u16 *x)
 {
-	return big_endian_desc(ohci) ?
-		cpu_to_be16p(x) :
-		cpu_to_le16p(x);
+	return big_endian_desc(ohci) ? cpu_to_be16(*x) : cpu_to_le16(*x);
 }
 
 static inline __hc32 cpu_to_hc32 (const struct ohci_hcd *ohci, const u32 x)

@@ -602,9 +600,7 @@ static inline __hc32 cpu_to_hc32 (const struct ohci_hcd *ohci, const u32 x)
 
 static inline __hc32 cpu_to_hc32p (const struct ohci_hcd *ohci, const u32 *x)
 {
-	return big_endian_desc(ohci) ?
-		cpu_to_be32p(x) :
-		cpu_to_le32p(x);
+	return big_endian_desc(ohci) ? cpu_to_be32(*x) : cpu_to_le32(*x);
 }
 
 /* ohci to cpu */
Signature · 1 line
1.5.5.1.570.g26b5e
maintainer
#1 lore raw

From: Harvey Harrison <[email protected]>
Date: Tue, 20 May 2008 12:24:08 -0700

Quoted 3 lines
Signed-off-by Harvey Harrison <[email protected]>

---
akpm: applies on top of the 21-patch aligned get/put helpers series.

Can you provide some contextual information in the changelog message?

Why are the cpu_to_*p() uses going away? Do the normal cpu_to_*() now transparently emit the special other-endian loads and stores some cpus?

You should always describe such things in your changelog message so people don't need to ask these kinds of questions.

#2 lore raw
In reply to Harvey Harrison

drivers/usb/host/ohci.h static inline __hc32 cpu_to_hc32 (const struct ohci_hcd *ohci, const u32 x) · line 603

Quoted 8 lines · Harvey Harrison
drivers/usb/host/ohci.h +1 -3
@@ -602,9 +600,7 @@ static inline __hc32 cpu_to_hc32 (const struct ohci_hcd *ohci, const u32 x)
 
 static inline __hc32 cpu_to_hc32p (const struct ohci_hcd *ohci, const u32 *x)
 {
-	return big_endian_desc(ohci) ?
-		cpu_to_be32p(x) :
-		cpu_to_le32p(x);
+	return big_endian_desc(ohci) ? cpu_to_be32(*x) : cpu_to_le32(*x);

Please don't do this, because it means we don't get to use the byte-reversing loads and stores on powerpc, and end up using several instructions instead of one.

Paul.