Commit 83b59b46 authored by David S. Miller's avatar David S. Miller

Merge branch 'fore200e-DMA-cleanups-and-fixes'

Christoph Hellwig says:

====================
fore200e DMA cleanups and fixes

The fore200e driver came up during some dma-related audits, so
here is the fallout.  Compile tested (x86 & sparc) only.
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 4b035271 1d9d8be9
This diff is collapsed.
...@@ -805,12 +805,6 @@ typedef struct fore200e_bus { ...@@ -805,12 +805,6 @@ typedef struct fore200e_bus {
int status_alignment; /* status words DMA alignment requirement */ int status_alignment; /* status words DMA alignment requirement */
u32 (*read)(volatile u32 __iomem *); u32 (*read)(volatile u32 __iomem *);
void (*write)(u32, volatile u32 __iomem *); void (*write)(u32, volatile u32 __iomem *);
u32 (*dma_map)(struct fore200e*, void*, int, int);
void (*dma_unmap)(struct fore200e*, u32, int, int);
void (*dma_sync_for_cpu)(struct fore200e*, u32, int, int);
void (*dma_sync_for_device)(struct fore200e*, u32, int, int);
int (*dma_chunk_alloc)(struct fore200e*, struct chunk*, int, int, int);
void (*dma_chunk_free)(struct fore200e*, struct chunk*);
int (*configure)(struct fore200e*); int (*configure)(struct fore200e*);
int (*map)(struct fore200e*); int (*map)(struct fore200e*);
void (*reset)(struct fore200e*); void (*reset)(struct fore200e*);
...@@ -844,7 +838,7 @@ typedef struct fore200e { ...@@ -844,7 +838,7 @@ typedef struct fore200e {
enum fore200e_state state; /* device state */ enum fore200e_state state; /* device state */
char name[16]; /* device name */ char name[16]; /* device name */
void* bus_dev; /* bus-specific kernel data */ struct device *dev;
int irq; /* irq number */ int irq; /* irq number */
unsigned long phys_base; /* physical base address */ unsigned long phys_base; /* physical base address */
void __iomem * virt_base; /* virtual base address */ void __iomem * virt_base; /* virtual base address */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment