[PATCH] move sg_dma_ macros out of asm-i386/pci.h

These macros belong in asm-i386/scatterlist.h instead.

As the headers are disentangled this has shown up as a problem with my
MCA SCSI drivers since they no-longer include asm/pci.h in any form but
need to traverse the scatterlist.

diff --git a/include/asm-i386/pci.h b/include/asm-i386/pci.h
index f3532db41a4d6aec2cef3a679edfac0bc280775c..f9af605e42bf303999d7c1cef93b910a7888fb10 100644 (file)
--- a/include/asm-i386/pci.h
+++ b/include/asm-i386/pci.h
@@ -82,14 +82,6 @@ pci_dac_dma_sync_single(struct pci_dev *pdev, dma64_addr_t dma_addr, size_t len,
        flush_write_buffers();
 }
 
-/* These macros should be used after a pci_map_sg call has been done
- * to get bus addresses of each of the SG entries and their lengths.
- * You should only work with the number of sg entries pci_map_sg
- * returns.
- */
-#define sg_dma_address(sg)     ((sg)->dma_address)
-#define sg_dma_len(sg)         ((sg)->length)
-
 #define HAVE_PCI_MMAP
 extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
                               enum pci_mmap_state mmap_state, int write_combine);

diff --git a/include/asm-i386/scatterlist.h b/include/asm-i386/scatterlist.h
index b238c8d0b0960d0092e010edc07f6a8c320079fa..55d6c953a76e2142b70e2738450b4728cdaa4343 100644 (file)
--- a/include/asm-i386/scatterlist.h
+++ b/include/asm-i386/scatterlist.h
@@ -8,6 +8,14 @@ struct scatterlist {
     unsigned int       length;
 };
 
+/* These macros should be used after a pci_map_sg call has been done
+ * to get bus addresses of each of the SG entries and their lengths.
+ * You should only work with the number of sg entries pci_map_sg
+ * returns.
+ */
+#define sg_dma_address(sg)     ((sg)->dma_address)
+#define sg_dma_len(sg)         ((sg)->length)
+
 #define ISA_DMA_THRESHOLD (0x00ffffff)
 
 #endif /* !(_I386_SCATTERLIST_H) */