Skip to content

Commit

Permalink
[ARM] dma: move IOMD and floppy DMA structures to RiscPC DMA code
Browse files Browse the repository at this point in the history
There's no point these being in a generic include file when they're
only used in arch/arm/mach-rpc/dma.c.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Russell King authored and Russell King committed Feb 21, 2009
1 parent f0ffc81 commit 308d333
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
13 changes: 0 additions & 13 deletions arch/arm/include/asm/mach/dma.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,19 +43,6 @@ struct dma_struct {
const struct dma_ops *d_ops;
};

struct floppy_dma {
struct dma_struct dma;
unsigned int fiq;
};

struct iomd_dma {
struct dma_struct dma;
unsigned int state;
unsigned long base; /* Controller base address */
int irq; /* Controller IRQ */
struct scatterlist cur_sg; /* Current controller buffer */
};

/*
* isa_dma_add - add an ISA-style DMA channel
*/
Expand Down
13 changes: 13 additions & 0 deletions arch/arm/mach-rpc/dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,14 @@
#include <asm/mach/dma.h>
#include <asm/hardware/iomd.h>

struct iomd_dma {
struct dma_struct dma;
unsigned int state;
unsigned long base; /* Controller base address */
int irq; /* Controller IRQ */
struct scatterlist cur_sg; /* Current controller buffer */
};

#if 0
typedef enum {
dma_size_8 = 1,
Expand Down Expand Up @@ -242,6 +250,11 @@ static struct fiq_handler fh = {
.name = "floppydma"
};

struct floppy_dma {
struct dma_struct dma;
unsigned int fiq;
};

static void floppy_enable_dma(unsigned int chan, dma_t *dma)
{
struct floppy_dma *fdma = container_of(dma, struct floppy_dma, dma);
Expand Down

0 comments on commit 308d333

Please sign in to comment.