Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

[safe/jmp/linux-2.6] / drivers / staging / sep / sep_dev.h

diff --git a/drivers/staging/sep/sep_dev.h b/drivers/staging/sep/sep_dev.h
index f0dc715..9200524 100644 (file)
--- a/drivers/staging/sep/sep_dev.h
+++ b/drivers/staging/sep/sep_dev.h
@@ -32,30 +32,25 @@ struct sep_device {
        /* pointer to pci dev */
        struct pci_dev *pdev;
 
-       unsigned long io_bus;
-       unsigned long io_end_bus;
-       unsigned long io_memory_size;
-       void __iomem *io_addr;
+       unsigned long in_use;
 
-       /* restricted access region */
-       dma_addr_t rar_bus;
-       void *rar_addr;
-
-       /* shared memory region */
-       dma_addr_t shared_bus;
+       /* address of the shared memory allocated during init for SEP driver
+          (coherent alloc) */
        void *shared_addr;
+       /* the physical address of the shared area */
+       dma_addr_t shared_bus;
 
-       /* firmware regions */
-       dma_addr_t cache_bus;
+       /* restricted access region (coherent alloc) */
+       dma_addr_t rar_bus;
+       void *rar_addr;
+       /* firmware regions: cache is at rar_addr */
        unsigned long cache_size;
-       void *cache_addr;
 
+       /* follows the cache */
        dma_addr_t resident_bus;
        unsigned long resident_size;
        void *resident_addr;
 
-       void *rar_region_addr;
-
        /* start address of the access to the SEP registers from driver */
        void __iomem *reg_addr;
        /* transaction counter that coordinates the transactions between SEP and HOST */
@@ -86,13 +81,6 @@ struct sep_device {
        /* pointer to the workqueue that handles the flow done interrupts */
        struct workqueue_struct *flow_wq;
 
-       /* address of the shared memory allocated during init for SEP driver */
-       void *shared_area;
-       /* the physical address of the shared area */
-       dma_addr_t shared_area_bus;
-
-       /* Message Shared Area start address - will be allocated during init */
-       void *message_shared_area_addr;
 };
 
 static struct sep_device *sep_dev;