[PATCH] umem iomem and (partial) endianness annotations

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/block/umem.c b/drivers/block/umem.c
index 2b126d8d2d24560170082c68ca7dfc5f82259fd9..db7083a0c87a8db97feb17225bd16bd02efffa20 100644 (file)
--- a/drivers/block/umem.c
+++ b/drivers/block/umem.c
@@ -108,11 +108,11 @@ struct cardinfo {
        int             irq;
 
        unsigned long   csr_base;
-       unsigned char   *csr_remap;
+       unsigned char   __iomem *csr_remap;
        unsigned long   csr_len;
 #ifdef CONFIG_MM_MAP_MEMORY
        unsigned long   mem_base;
-       unsigned char   *mem_remap;
+       unsigned char   __iomem *mem_remap;
        unsigned long   mem_len;
 #endif
 
@@ -926,7 +926,7 @@ static int __devinit mm_pci_probe(struct pci_dev *dev, const struct pci_device_i
                goto failed_req_mem;
        }
 
-       if (!(card->mem_remap = (unsigned char *)ioremap(card->mem_base, cards->mem_len))) {
+       if (!(card->mem_remap = ioremap(card->mem_base, cards->mem_len))) {
                printk(KERN_ERR "MM%d: Unable to remap memory region\n", card->card_number);
                ret = -ENOMEM;
 
@@ -1107,12 +1107,12 @@ static int __devinit mm_pci_probe(struct pci_dev *dev, const struct pci_device_i
                                    card->mm_pages[1].page_dma);
  failed_magic:
 #ifdef CONFIG_MM_MAP_MEMORY
-       iounmap((void *) card->mem_remap);
+       iounmap(card->mem_remap);
  failed_remap_mem:
        release_mem_region(card->mem_base, card->mem_len);
  failed_req_mem:
 #endif
-       iounmap((void *) card->csr_remap);
+       iounmap(card->csr_remap);
  failed_remap_csr:
        release_mem_region(card->csr_base, card->csr_len);
  failed_req_csr:

diff --git a/include/linux/umem.h b/include/linux/umem.h
index 2eb1f55644cc498d6ea0249a3cd0a8f27e8068af..f36ebfc32bf6d484b342a8eb123bc573a4d006df 100644 (file)
--- a/include/linux/umem.h
+++ b/include/linux/umem.h
@@ -110,19 +110,19 @@ DMA READ OPERATIONS.
 #define DMA_WRITE_TO_HOST 1
 
 struct mm_dma_desc {
-       u64     pci_addr;
-       u64     local_addr;
-       u32     transfer_size;
+       __le64  pci_addr;
+       __le64  local_addr;
+       __le32  transfer_size;
        u32     zero1;
-       u64     next_desc_addr;
-       u64     sem_addr;
-       u32     control_bits;
+       __le64  next_desc_addr;
+       __le64  sem_addr;
+       __le32  control_bits;
        u32     zero2;
 
        dma_addr_t data_dma_handle;
 
        /* Copy of the bits */
-       u64     sem_control_bits;
+       __le64  sem_control_bits;
 } __attribute__((aligned(8)));
 
 #define PCI_VENDOR_ID_MICRO_MEMORY             0x1332