From 70bc3dbedb0e4d67b7d3842187958595140b56f5 Mon Sep 17 00:00:00 2001 From: Luca Ellero Date: Thu, 10 Jul 2014 11:01:46 +0200 Subject: [PATCH] staging: ced1401: remove typedef for DMADESC Signed-off-by: Luca Ellero Signed-off-by: Greg Kroah-Hartman --- drivers/staging/ced1401/usb1401.c | 5 +++-- drivers/staging/ced1401/usb1401.h | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/staging/ced1401/usb1401.c b/drivers/staging/ced1401/usb1401.c index ee16353719ab..9cc79a8090d6 100644 --- a/drivers/staging/ced1401/usb1401.c +++ b/drivers/staging/ced1401/usb1401.c @@ -944,8 +944,9 @@ static bool ced_read_huff(volatile unsigned int *pDWord, char *pBuf, ** we start handling the data at offset zero. ** *****************************************************************************/ -static bool ced_read_dma_info(volatile DMADESC *pDmaDesc, DEVICE_EXTENSION *pdx, - char *pBuf, unsigned int dwCount) +static bool ced_read_dma_info(volatile struct dmadesc *pDmaDesc, + DEVICE_EXTENSION *pdx, + char *pBuf, unsigned int dwCount) { bool bResult = false; /* assume we won't succeed */ unsigned char ucData; diff --git a/drivers/staging/ced1401/usb1401.h b/drivers/staging/ced1401/usb1401.h index 689251dc0959..d269d83c3fc3 100644 --- a/drivers/staging/ced1401/usb1401.h +++ b/drivers/staging/ced1401/usb1401.h @@ -120,13 +120,13 @@ struct transarea { /* The DMADESC structure is used to hold information on the transfer in progress. It */ /* is set up by ReadDMAInfo, using information sent by the 1401 in an escape sequence. */ -typedef struct dmadesc { +struct dmadesc { unsigned short wTransType; /* transfer type as TM_xxx above */ unsigned short wIdent; /* identifier word */ unsigned int dwSize; /* bytes to transfer */ unsigned int dwOffset; /* offset into transfer area for trans */ bool bOutWard; /* true when data is going TO 1401 */ -} DMADESC; +}; #define INBUF_SZ 256 /* input buffer size */ #define OUTBUF_SZ 256 /* output buffer size */ @@ -157,7 +157,7 @@ typedef struct _DEVICE_EXTENSION { volatile unsigned int dwDMAFlag; /* state of DMA */ struct transarea rTransDef[MAX_TRANSAREAS]; /* transfer area info */ - volatile DMADESC rDMAInfo; /* info on current DMA transfer */ + volatile struct dmadesc rDMAInfo; /* info on current DMA transfer */ volatile bool bXFerWaiting; /* Flag set if DMA transfer stalled */ volatile bool bInDrawDown; /* Flag that we want to halt transfers */ -- 2.39.5