From wfp5p@virginia.edu Mon Mar 16 17:21:33 2009 From: Bill Pemberton Date: Mon, 16 Mar 2009 22:06:47 -0400 Subject: Staging: comedi: Remove DMABUF typedef To: greg@kroah.com Message-ID: <20090317020647.14467.25624.stgit@viridian.itc.Virginia.EDU> Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/s626.c | 8 ++++---- drivers/staging/comedi/drivers/s626.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) --- a/drivers/staging/comedi/drivers/s626.c +++ b/drivers/staging/comedi/drivers/s626.c @@ -144,8 +144,8 @@ struct s626_private { uint16_t CounterIntEnabs; /* Counter interrupt enable mask for MISC2 register. */ uint8_t AdcItems; /* Number of items in ADC poll list. */ - DMABUF RPSBuf; /* DMA buffer used to hold ADC (RPS1) program. */ - DMABUF ANABuf; + struct bufferDMA RPSBuf; /* DMA buffer used to hold ADC (RPS1) program. */ + struct bufferDMA ANABuf; /* DMA buffer used to receive ADC data and hold DAC data. */ uint32_t *pDacWBuf; /* Pointer to logical adrs of DMA buffer used to hold DAC data. */ @@ -275,7 +275,7 @@ static uint16_t DEBIread(struct comedi_d static void DEBIwrite(struct comedi_device *dev, uint16_t addr, uint16_t wdata); static void DEBIreplace(struct comedi_device *dev, uint16_t addr, uint16_t mask, uint16_t wdata); -static void CloseDMAB(struct comedi_device *dev, DMABUF *pdma, size_t bsize); +static void CloseDMAB(struct comedi_device *dev, struct bufferDMA *pdma, size_t bsize); /* COUNTER OBJECT ------------------------------------------------ */ struct enc_private { @@ -2733,7 +2733,7 @@ static void DEBIreplace(struct comedi_de DEBItransfer(dev); /* Execute the DEBI Write transfer. */ } -static void CloseDMAB(struct comedi_device *dev, DMABUF *pdma, size_t bsize) +static void CloseDMAB(struct comedi_device *dev, struct bufferDMA *pdma, size_t bsize) { void *vbptr; dma_addr_t vpptr; --- a/drivers/staging/comedi/drivers/s626.h +++ b/drivers/staging/comedi/drivers/s626.h @@ -739,8 +739,8 @@ /* unsigned int enc; */ /* }CallCounter; */ -typedef struct bufferDMA { +struct bufferDMA { dma_addr_t PhysicalBase; void *LogicalBase; uint32_t DMAHandle; -} DMABUF; +};