Linus wants lowercase names for the PCI_UNMAP_foo interfaces.

13 files changed, 79 insertions, 79 deletions

diff --git a/Documentation/DMA-mapping.txt b/Documentation/DMA-mapping.txt
index 15c765924..6d2961c14 100644
--- a/Documentation/DMA-mapping.txt
+++ b/Documentation/DMA-mapping.txt
@@ -720,7 +720,7 @@ transform some example code.
    NOTE: DO NOT put a semicolon at the end of the DECLARE_*()
          macro.
 
-2) Use PCI_UNMAP_{ADDR,LEN}_SET to set these values.
+2) Use pci_unmap_{addr,len}_set to set these values.
    Example, before:
 
 	ringp->mapping = FOO;
@@ -728,10 +728,10 @@ transform some example code.
 
    after:
 
-	PCI_UNMAP_ADDR_SET(ringp, mapping, FOO);
-	PCI_UNMAP_LEN_SET(ringp, len, BAR);
+	pci_unmap_addr_set(ringp, mapping, FOO);
+	pci_unmap_len_set(ringp, len, BAR);
 
-3) Use PCI_UNMAP_{ADDR,LEN} to access these values.
+3) Use pci_unmap_{addr,len} to access these values.
    Example, before:
 
 	pci_unmap_single(pdev, ringp->mapping, ringp->len,
@@ -740,8 +740,8 @@ transform some example code.
    after:
 
 	pci_unmap_single(pdev,
-			 PCI_UNMAP_ADDR(ringp, mapping),
-			 PCI_UNMAP_LEN(ringp, len),
+			 pci_unmap_addr(ringp, mapping),
+			 pci_unmap_len(ringp, len),
 			 PCI_DMA_FROMDEVICE);
 
 It really should be self-explanatory.  We treat the ADDR and LEN
diff --git a/drivers/net/acenic.c b/drivers/net/acenic.c
index cf2715ef1..59a40ce20 100644
--- a/drivers/net/acenic.c
+++ b/drivers/net/acenic.c
@@ -847,7 +847,7 @@ static void __exit ace_module_cleanup(void)
 				dma_addr_t mapping;
 
 				ringp = &ap->skb->rx_std_skbuff[i];
-				mapping = PCI_UNMAP_ADDR(ringp, mapping);
+				mapping = pci_unmap_addr(ringp, mapping);
 				pci_unmap_page(ap->pdev, mapping,
 					       ACE_STD_BUFSIZE - (2 + 16),
 					       PCI_DMA_FROMDEVICE);
@@ -866,7 +866,7 @@ static void __exit ace_module_cleanup(void)
 					dma_addr_t mapping;
 
 					ringp = &ap->skb->rx_mini_skbuff[i];
-					mapping = PCI_UNMAP_ADDR(ringp,mapping);
+					mapping = pci_unmap_addr(ringp,mapping);
 					pci_unmap_page(ap->pdev, mapping,
 						       ACE_MINI_BUFSIZE - (2 + 16),
 						       PCI_DMA_FROMDEVICE);
@@ -884,7 +884,7 @@ static void __exit ace_module_cleanup(void)
 				dma_addr_t mapping;
 
 				ringp = &ap->skb->rx_jumbo_skbuff[i];
-				mapping = PCI_UNMAP_ADDR(ringp, mapping);
+				mapping = pci_unmap_addr(ringp, mapping);
 				pci_unmap_page(ap->pdev, mapping,
 					       ACE_JUMBO_BUFSIZE - (2 + 16),
 					       PCI_DMA_FROMDEVICE);
@@ -1842,7 +1842,7 @@ static void ace_load_std_rx_ring(struct ace_private *ap, int nr_bufs)
 				       ACE_STD_BUFSIZE - (2 + 16),
 				       PCI_DMA_FROMDEVICE);
 		ap->skb->rx_std_skbuff[idx].skb = skb;
-		PCI_UNMAP_ADDR_SET(&ap->skb->rx_std_skbuff[idx],
+		pci_unmap_addr_set(&ap->skb->rx_std_skbuff[idx],
 				   mapping, mapping);
 
 		rd = &ap->rx_std_ring[idx];
@@ -1908,7 +1908,7 @@ static void ace_load_mini_rx_ring(struct ace_private *ap, int nr_bufs)
 				       ACE_MINI_BUFSIZE - (2 + 16),
 				       PCI_DMA_FROMDEVICE);
 		ap->skb->rx_mini_skbuff[idx].skb = skb;
-		PCI_UNMAP_ADDR_SET(&ap->skb->rx_mini_skbuff[idx],
+		pci_unmap_addr_set(&ap->skb->rx_mini_skbuff[idx],
 				   mapping, mapping);
 
 		rd = &ap->rx_mini_ring[idx];
@@ -1969,7 +1969,7 @@ static void ace_load_jumbo_rx_ring(struct ace_private *ap, int nr_bufs)
 				       ACE_JUMBO_BUFSIZE - (2 + 16),
 				       PCI_DMA_FROMDEVICE);
 		ap->skb->rx_jumbo_skbuff[idx].skb = skb;
-		PCI_UNMAP_ADDR_SET(&ap->skb->rx_jumbo_skbuff[idx],
+		pci_unmap_addr_set(&ap->skb->rx_jumbo_skbuff[idx],
 				   mapping, mapping);
 
 		rd = &ap->rx_jumbo_ring[idx];
@@ -2177,7 +2177,7 @@ static void ace_rx_int(struct net_device *dev, u32 rxretprd, u32 rxretcsm)
 		skb = rip->skb;
 		rip->skb = NULL;
 		pci_unmap_page(ap->pdev,
-			       PCI_UNMAP_ADDR(rip, mapping),
+			       pci_unmap_addr(rip, mapping),
 			       mapsize,
 			       PCI_DMA_FROMDEVICE);
 		skb_put(skb, retdesc->size);
@@ -2244,13 +2244,13 @@ static inline void ace_tx_int(struct net_device *dev,
 
 		info = ap->skb->tx_skbuff + idx;
 		skb = info->skb;
-		mapping = PCI_UNMAP_ADDR(info, mapping);
+		mapping = pci_unmap_addr(info, mapping);
 
 		if (mapping) {
 			pci_unmap_page(ap->pdev, mapping,
-				       PCI_UNMAP_LEN(info, maplen),
+				       pci_unmap_len(info, maplen),
 				       PCI_DMA_TODEVICE);
-			PCI_UNMAP_ADDR_SET(info, mapping, 0);
+			pci_unmap_addr_set(info, mapping, 0);
 		}
 
 		if (skb) {
@@ -2534,14 +2534,14 @@ static int ace_close(struct net_device *dev)
 
 		info = ap->skb->tx_skbuff + i;
 		skb = info->skb;
-		mapping = PCI_UNMAP_ADDR(info, mapping);
+		mapping = pci_unmap_addr(info, mapping);
 
 		if (mapping) {
 			memset(ap->tx_ring + i, 0, sizeof(struct tx_desc));
 			pci_unmap_page(ap->pdev, mapping,
-				       PCI_UNMAP_LEN(info, maplen),
+				       pci_unmap_len(info, maplen),
 				       PCI_DMA_TODEVICE);
-			PCI_UNMAP_ADDR_SET(info, mapping, 0);
+			pci_unmap_addr_set(info, mapping, 0);
 		}
 		if (skb) {
 			dev_kfree_skb(skb);
@@ -2575,8 +2575,8 @@ ace_map_tx_skb(struct ace_private *ap, struct sk_buff *skb,
 
 	info = ap->skb->tx_skbuff + idx;
 	info->skb = tail;
-	PCI_UNMAP_ADDR_SET(info, mapping, mapping);
-	PCI_UNMAP_LEN_SET(info, maplen, skb->len);
+	pci_unmap_addr_set(info, mapping, mapping);
+	pci_unmap_len_set(info, maplen, skb->len);
 	return mapping;
 }
 
@@ -2677,8 +2677,8 @@ restart:
 			} else {
 				info->skb = NULL;
 			}
-			PCI_UNMAP_ADDR_SET(info, mapping, mapping);
-			PCI_UNMAP_LEN_SET(info, maplen, frag->size);
+			pci_unmap_addr_set(info, mapping, mapping);
+			pci_unmap_len_set(info, maplen, frag->size);
 			ace_load_tx_bd(desc, mapping, flagsize);
 		}
 	}
diff --git a/include/asm-alpha/pci.h b/include/asm-alpha/pci.h
index f073ee900..ae1e9c9a2 100644
--- a/include/asm-alpha/pci.h
+++ b/include/asm-alpha/pci.h
@@ -106,13 +106,13 @@ extern void pci_unmap_page(struct pci_dev *, dma_addr_t, size_t, int);
 	dma_addr_t ADDR_NAME;
 #define DECLARE_PCI_UNMAP_LEN(LEN_NAME)		\
 	__u32 LEN_NAME;
-#define PCI_UNMAP_ADDR(PTR, ADDR_NAME)			\
+#define pci_unmap_addr(PTR, ADDR_NAME)			\
 	((PTR)->ADDR_NAME)
-#define PCI_UNMAP_ADDR_SET(PTR, ADDR_NAME, VAL)		\
+#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL)		\
 	(((PTR)->ADDR_NAME) = (VAL))
-#define PCI_UNMAP_LEN(PTR, LEN_NAME)			\
+#define pci_unmap_len(PTR, LEN_NAME)			\
 	((PTR)->LEN_NAME)
-#define PCI_UNMAP_LEN_SET(PTR, LEN_NAME, VAL)		\
+#define pci_unmap_len_set(PTR, LEN_NAME, VAL)		\
 	(((PTR)->LEN_NAME) = (VAL))
 
 /* Map a set of buffers described by scatterlist in streaming mode for
diff --git a/include/asm-arm/pci.h b/include/asm-arm/pci.h
index dca7d55b5..935f73ad7 100644
--- a/include/asm-arm/pci.h
+++ b/include/asm-arm/pci.h
@@ -103,21 +103,21 @@ pci_unmap_single(struct pci_dev *hwdev, dma_addr_t dma_addr, size_t size, int di
 	dma_addr_t ADDR_NAME;
 #define DECLARE_PCI_UNMAP_LEN(LEN_NAME)		\
 	__u32 LEN_NAME;
-#define PCI_UNMAP_ADDR(PTR, ADDR_NAME)			\
+#define pci_unmap_addr(PTR, ADDR_NAME)			\
 	((PTR)->ADDR_NAME)
-#define PCI_UNMAP_ADDR_SET(PTR, ADDR_NAME, VAL)		\
+#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL)		\
 	(((PTR)->ADDR_NAME) = (VAL))
-#define PCI_UNMAP_LEN(PTR, LEN_NAME)			\
+#define pci_unmap_len(PTR, LEN_NAME)			\
 	((PTR)->LEN_NAME)
-#define PCI_UNMAP_LEN_SET(PTR, LEN_NAME, VAL)		\
+#define pci_unmap_len_set(PTR, LEN_NAME, VAL)		\
 	(((PTR)->LEN_NAME) = (VAL))
 #else /* !(CONFIG_SA1111) */
 #define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)
 #define DECLARE_PCI_UNMAP_LEN(LEN_NAME)
-#define PCI_UNMAP_ADDR(PTR, ADDR_NAME)		(0)
-#define PCI_UNMAP_ADDR_SET(PTR, ADDR_NAME, VAL)	do { } while (0)
-#define PCI_UNMAP_LEN(PTR, LEN_NAME)		(0)
-#define PCI_UNMAP_LEN_SET(PTR, LEN_NAME, VAL)	do { } while (0)
+#define pci_unmap_addr(PTR, ADDR_NAME)		(0)
+#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL)	do { } while (0)
+#define pci_unmap_len(PTR, LEN_NAME)		(0)
+#define pci_unmap_len_set(PTR, LEN_NAME, VAL)	do { } while (0)
 #endif /* CONFIG_SA1111 */
 
 /* Map a set of buffers described by scatterlist in streaming
diff --git a/include/asm-i386/pci.h b/include/asm-i386/pci.h
index 5d69c0a4c..571213616 100644
--- a/include/asm-i386/pci.h
+++ b/include/asm-i386/pci.h
@@ -117,10 +117,10 @@ static inline void pci_unmap_page(struct pci_dev *hwdev, dma_addr_t dma_address,
 /* pci_unmap_{page,single} is a nop so... */
 #define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)
 #define DECLARE_PCI_UNMAP_LEN(LEN_NAME)
-#define PCI_UNMAP_ADDR(PTR, ADDR_NAME)		(0)
-#define PCI_UNMAP_ADDR_SET(PTR, ADDR_NAME, VAL)	do { } while (0)
-#define PCI_UNMAP_LEN(PTR, LEN_NAME)		(0)
-#define PCI_UNMAP_LEN_SET(PTR, LEN_NAME, VAL)	do { } while (0)
+#define pci_unmap_addr(PTR, ADDR_NAME)		(0)
+#define pci_unmap_addr_SET(PTR, ADDR_NAME, VAL)	do { } while (0)
+#define pci_unmap_len(PTR, LEN_NAME)		(0)
+#define pci_unmap_len_set(PTR, LEN_NAME, VAL)	do { } while (0)
 
 /* Map a set of buffers described by scatterlist in streaming
  * mode for DMA.  This is the scather-gather version of the
diff --git a/include/asm-ia64/pci.h b/include/asm-ia64/pci.h
index c43eb62f6..5be097430 100644
--- a/include/asm-ia64/pci.h
+++ b/include/asm-ia64/pci.h
@@ -51,13 +51,13 @@ pcibios_penalize_isa_irq (int irq)
 	dma_addr_t ADDR_NAME;
 #define DECLARE_PCI_UNMAP_LEN(LEN_NAME)		\
 	__u32 LEN_NAME;
-#define PCI_UNMAP_ADDR(PTR, ADDR_NAME)			\
+#define pci_unmap_addr(PTR, ADDR_NAME)			\
 	((PTR)->ADDR_NAME)
-#define PCI_UNMAP_ADDR_SET(PTR, ADDR_NAME, VAL)		\
+#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL)		\
 	(((PTR)->ADDR_NAME) = (VAL))
-#define PCI_UNMAP_LEN(PTR, LEN_NAME)			\
+#define pci_unmap_len(PTR, LEN_NAME)			\
 	((PTR)->LEN_NAME)
-#define PCI_UNMAP_LEN_SET(PTR, LEN_NAME, VAL)		\
+#define pci_unmap_len_set(PTR, LEN_NAME, VAL)		\
 	(((PTR)->LEN_NAME) = (VAL))
 
 /*
diff --git a/include/asm-mips/pci.h b/include/asm-mips/pci.h
index 982faa206..1ae7c25df 100644
--- a/include/asm-mips/pci.h
+++ b/include/asm-mips/pci.h
@@ -117,10 +117,10 @@ extern inline void pci_unmap_single(struct pci_dev *hwdev, dma_addr_t dma_addr,
 /* pci_unmap_{page,single} is a nop so... */
 #define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)
 #define DECLARE_PCI_UNMAP_LEN(LEN_NAME)
-#define PCI_UNMAP_ADDR(PTR, ADDR_NAME)		(0)
-#define PCI_UNMAP_ADDR_SET(PTR, ADDR_NAME, VAL)	do { } while (0)
-#define PCI_UNMAP_LEN(PTR, LEN_NAME)		(0)
-#define PCI_UNMAP_LEN_SET(PTR, LEN_NAME, VAL)	do { } while (0)
+#define pci_unmap_addr(PTR, ADDR_NAME)		(0)
+#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL)	do { } while (0)
+#define pci_unmap_len(PTR, LEN_NAME)		(0)
+#define pci_unmap_len_set(PTR, LEN_NAME, VAL)	do { } while (0)
 
 /*
  * Map a set of buffers described by scatterlist in streaming
diff --git a/include/asm-mips64/pci.h b/include/asm-mips64/pci.h
index 7db3b9ba2..d18ee0cd6 100644
--- a/include/asm-mips64/pci.h
+++ b/include/asm-mips64/pci.h
@@ -91,13 +91,13 @@ extern void pci_dma_sync_sg(struct pci_dev *hwdev, struct scatterlist *sg,
 	dma_addr_t ADDR_NAME;
 #define DECLARE_PCI_UNMAP_LEN(LEN_NAME)		\
 	__u32 LEN_NAME;
-#define PCI_UNMAP_ADDR(PTR, ADDR_NAME)			\
+#define pci_unmap_addr(PTR, ADDR_NAME)			\
 	((PTR)->ADDR_NAME)
-#define PCI_UNMAP_ADDR_SET(PTR, ADDR_NAME, VAL)		\
+#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL)		\
 	(((PTR)->ADDR_NAME) = (VAL))
-#define PCI_UNMAP_LEN(PTR, LEN_NAME)			\
+#define pci_unmap_len(PTR, LEN_NAME)			\
 	((PTR)->LEN_NAME)
-#define PCI_UNMAP_LEN_SET(PTR, LEN_NAME, VAL)		\
+#define pci_unmap_len_set(PTR, LEN_NAME, VAL)		\
 	(((PTR)->LEN_NAME) = (VAL))
 
 #else /* CONFIG_MAPPED_PCI_IO  */
@@ -141,10 +141,10 @@ static inline void pci_unmap_single(struct pci_dev *hwdev, dma_addr_t dma_addr,
 /* pci_unmap_{page,single} is a nop so... */
 #define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)
 #define DECLARE_PCI_UNMAP_LEN(LEN_NAME)
-#define PCI_UNMAP_ADDR(PTR, ADDR_NAME)		(0)
-#define PCI_UNMAP_ADDR_SET(PTR, ADDR_NAME, VAL)	do { } while (0)
-#define PCI_UNMAP_LEN(PTR, LEN_NAME)		(0)
-#define PCI_UNMAP_LEN_SET(PTR, LEN_NAME, VAL)	do { } while (0)
+#define pci_unmap_addr(PTR, ADDR_NAME)		(0)
+#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL)	do { } while (0)
+#define pci_unmap_len(PTR, LEN_NAME)		(0)
+#define pci_unmap_len_set(PTR, LEN_NAME, VAL)	do { } while (0)
 
 /*
  * Map a set of buffers described by scatterlist in streaming
diff --git a/include/asm-parisc/pci.h b/include/asm-parisc/pci.h
index 234fafecd..779eda070 100644
--- a/include/asm-parisc/pci.h
+++ b/include/asm-parisc/pci.h
@@ -177,13 +177,13 @@ static inline int pci_dma_panic(char *msg)
 	dma_addr_t ADDR_NAME;
 #define DECLARE_PCI_UNMAP_LEN(LEN_NAME)		\
 	__u32 LEN_NAME;
-#define PCI_UNMAP_ADDR(PTR, ADDR_NAME)			\
+#define pci_unmap_addr(PTR, ADDR_NAME)			\
 	((PTR)->ADDR_NAME)
-#define PCI_UNMAP_ADDR_SET(PTR, ADDR_NAME, VAL)		\
+#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL)		\
 	(((PTR)->ADDR_NAME) = (VAL))
-#define PCI_UNMAP_LEN(PTR, LEN_NAME)			\
+#define pci_unmap_len(PTR, LEN_NAME)			\
 	((PTR)->LEN_NAME)
-#define PCI_UNMAP_LEN_SET(PTR, LEN_NAME, VAL)		\
+#define pci_unmap_len_set(PTR, LEN_NAME, VAL)		\
 	(((PTR)->LEN_NAME) = (VAL))
 
 /* For U2/Astro/Ike based platforms (which are fully I/O coherent)
diff --git a/include/asm-ppc/pci.h b/include/asm-ppc/pci.h
index bb8c992e6..7a28e8bad 100644
--- a/include/asm-ppc/pci.h
+++ b/include/asm-ppc/pci.h
@@ -105,10 +105,10 @@ static inline void pci_unmap_single(struct pci_dev *hwdev, dma_addr_t dma_addr,
 /* pci_unmap_{page,single} is a nop so... */
 #define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)
 #define DECLARE_PCI_UNMAP_LEN(LEN_NAME)
-#define PCI_UNMAP_ADDR(PTR, ADDR_NAME)		(0)
-#define PCI_UNMAP_ADDR_SET(PTR, ADDR_NAME, VAL)	do { } while (0)
-#define PCI_UNMAP_LEN(PTR, LEN_NAME)		(0)
-#define PCI_UNMAP_LEN_SET(PTR, LEN_NAME, VAL)	do { } while (0)
+#define pci_unmap_addr(PTR, ADDR_NAME)		(0)
+#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL)	do { } while (0)
+#define pci_unmap_len(PTR, LEN_NAME)		(0)
+#define pci_unmap_len_set(PTR, LEN_NAME, VAL)	do { } while (0)
 
 /*
  * pci_{map,unmap}_single_page maps a kernel page to a dma_addr_t. identical
diff --git a/include/asm-sh/pci.h b/include/asm-sh/pci.h
index a2110cbb0..d580d57aa 100644
--- a/include/asm-sh/pci.h
+++ b/include/asm-sh/pci.h
@@ -97,21 +97,21 @@ static inline dma_addr_t pci_map_single(struct pci_dev *hwdev, void *ptr,
 	dma_addr_t ADDR_NAME;
 #define DECLARE_PCI_UNMAP_LEN(LEN_NAME)		\
 	__u32 LEN_NAME;
-#define PCI_UNMAP_ADDR(PTR, ADDR_NAME)			\
+#define pci_unmap_addr(PTR, ADDR_NAME)			\
 	((PTR)->ADDR_NAME)
-#define PCI_UNMAP_ADDR_SET(PTR, ADDR_NAME, VAL)		\
+#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL)		\
 	(((PTR)->ADDR_NAME) = (VAL))
-#define PCI_UNMAP_LEN(PTR, LEN_NAME)			\
+#define pci_unmap_len(PTR, LEN_NAME)			\
 	((PTR)->LEN_NAME)
-#define PCI_UNMAP_LEN_SET(PTR, LEN_NAME, VAL)		\
+#define pci_unmap_len_set(PTR, LEN_NAME, VAL)		\
 	(((PTR)->LEN_NAME) = (VAL))
 #else
 #define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)
 #define DECLARE_PCI_UNMAP_LEN(LEN_NAME)
-#define PCI_UNMAP_ADDR(PTR, ADDR_NAME)		(0)
-#define PCI_UNMAP_ADDR_SET(PTR, ADDR_NAME, VAL)	do { } while (0)
-#define PCI_UNMAP_LEN(PTR, LEN_NAME)		(0)
-#define PCI_UNMAP_LEN_SET(PTR, LEN_NAME, VAL)	do { } while (0)
+#define pci_unmap_addr(PTR, ADDR_NAME)		(0)
+#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL)	do { } while (0)
+#define pci_unmap_len(PTR, LEN_NAME)		(0)
+#define pci_unmap_len_set(PTR, LEN_NAME, VAL)	do { } while (0)
 #endif
 
 /* Unmap a single streaming mode DMA translation.  The dma_addr and size
diff --git a/include/asm-sparc/pci.h b/include/asm-sparc/pci.h
index f1fefcc5d..53d6d6e54 100644
--- a/include/asm-sparc/pci.h
+++ b/include/asm-sparc/pci.h
@@ -69,13 +69,13 @@ extern void pci_unmap_single(struct pci_dev *hwdev, dma_addr_t dma_addr, size_t
 	dma_addr_t ADDR_NAME;
 #define DECLARE_PCI_UNMAP_LEN(LEN_NAME)		\
 	__u32 LEN_NAME;
-#define PCI_UNMAP_ADDR(PTR, ADDR_NAME)			\
+#define pci_unmap_addr(PTR, ADDR_NAME)			\
 	((PTR)->ADDR_NAME)
-#define PCI_UNMAP_ADDR_SET(PTR, ADDR_NAME, VAL)		\
+#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL)		\
 	(((PTR)->ADDR_NAME) = (VAL))
-#define PCI_UNMAP_LEN(PTR, LEN_NAME)			\
+#define pci_unmap_len(PTR, LEN_NAME)			\
 	((PTR)->LEN_NAME)
-#define PCI_UNMAP_LEN_SET(PTR, LEN_NAME, VAL)		\
+#define pci_unmap_len_set(PTR, LEN_NAME, VAL)		\
 	(((PTR)->LEN_NAME) = (VAL))
 
 /* Map a set of buffers described by scatterlist in streaming
diff --git a/include/asm-sparc64/pci.h b/include/asm-sparc64/pci.h
index ddaf94f2c..5debe1be7 100644
--- a/include/asm-sparc64/pci.h
+++ b/include/asm-sparc64/pci.h
@@ -82,13 +82,13 @@ extern void pci_unmap_single(struct pci_dev *hwdev, dma_addr_t dma_addr, size_t
 	dma_addr_t ADDR_NAME;
 #define DECLARE_PCI_UNMAP_LEN(LEN_NAME)		\
 	__u32 LEN_NAME;
-#define PCI_UNMAP_ADDR(PTR, ADDR_NAME)			\
+#define pci_unmap_addr(PTR, ADDR_NAME)			\
 	((PTR)->ADDR_NAME)
-#define PCI_UNMAP_ADDR_SET(PTR, ADDR_NAME, VAL)		\
+#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL)		\
 	(((PTR)->ADDR_NAME) = (VAL))
-#define PCI_UNMAP_LEN(PTR, LEN_NAME)			\
+#define pci_unmap_len(PTR, LEN_NAME)			\
 	((PTR)->LEN_NAME)
-#define PCI_UNMAP_LEN_SET(PTR, LEN_NAME, VAL)		\
+#define pci_unmap_len_set(PTR, LEN_NAME, VAL)		\
 	(((PTR)->LEN_NAME) = (VAL))
 
 /* Map a set of buffers described by scatterlist in streaming