From 0dfcb0b9c5f1dbcf3d925e41248b7f5072470d67 Mon Sep 17 00:00:00 2001 From: Luca Ellero Date: Thu, 10 Jul 2014 11:01:50 +0200 Subject: [PATCH] staging: ced1401: rename members of struct dmadesc Rename members with CamelCase and Hungarian notation Signed-off-by: Luca Ellero Signed-off-by: Greg Kroah-Hartman --- drivers/staging/ced1401/ced_ioc.c | 11 ++++--- drivers/staging/ced1401/usb1401.c | 53 +++++++++++++++---------------- drivers/staging/ced1401/usb1401.h | 15 +++++---- 3 files changed, 40 insertions(+), 39 deletions(-) diff --git a/drivers/staging/ced1401/ced_ioc.c b/drivers/staging/ced1401/ced_ioc.c index 2eb1eb9ede65..d9ec20006692 100644 --- a/drivers/staging/ced1401/ced_ioc.c +++ b/drivers/staging/ced1401/ced_ioc.c @@ -620,7 +620,7 @@ int ced_clear_area(struct ced_data *ced, int nArea) wake_up_interruptible(&pTA->event); /* release anything that was waiting */ if (ced->bXFerWaiting - && (ced->rDMAInfo.wIdent == nArea)) + && (ced->rDMAInfo.ident == nArea)) ced->bXFerWaiting = false; /* Cannot have pending xfer if area cleared */ /* Clean out the struct transarea except for the wait queue, which is at the end */ @@ -1461,10 +1461,11 @@ int ced_free_circ_block(struct ced_data *ced, TCIRCBLOCK __user *pCB) /* If we have one, kick off pending transfer */ if (bWaiting) { /* Got a block xfer waiting? */ int RWMStat = - ced_read_write_mem(ced, !ced->rDMAInfo.bOutWard, - ced->rDMAInfo.wIdent, - ced->rDMAInfo.dwOffset, - ced->rDMAInfo.dwSize); + ced_read_write_mem(ced, + !ced->rDMAInfo.outward, + ced->rDMAInfo.ident, + ced->rDMAInfo.offset, + ced->rDMAInfo.size); if (RWMStat != U14ERR_NOERROR) dev_err(&ced->interface->dev, "%s: rw setup failed %d\n", diff --git a/drivers/staging/ced1401/usb1401.c b/drivers/staging/ced1401/usb1401.c index 17f2be5254d3..30d103cb1067 100644 --- a/drivers/staging/ced1401/usb1401.c +++ b/drivers/staging/ced1401/usb1401.c @@ -662,10 +662,10 @@ static void staged_callback(struct urb *pUrb) dev_info(&ced->interface->dev, "*** RWM_Complete *** pending transfer will now be set up!!!\n"); iReturn = - ced_read_write_mem(ced, !ced->rDMAInfo.bOutWard, - ced->rDMAInfo.wIdent, - ced->rDMAInfo.dwOffset, - ced->rDMAInfo.dwSize); + ced_read_write_mem(ced, !ced->rDMAInfo.outward, + ced->rDMAInfo.ident, + ced->rDMAInfo.offset, + ced->rDMAInfo.size); if (iReturn) dev_err(&ced->interface->dev, @@ -962,36 +962,36 @@ static bool ced_read_dma_info(volatile struct dmadesc *pDmaDesc, unsigned short wIdent = ((ucData >> 4) & 0x07); /* and area identifier */ /* fill in the structure we were given */ - pDmaDesc->wTransType = ucTransCode; /* type of transfer */ - pDmaDesc->wIdent = wIdent; /* area to use */ - pDmaDesc->dwSize = 0; /* initialise other bits */ - pDmaDesc->dwOffset = 0; + pDmaDesc->trans_type = ucTransCode; /* type of transfer */ + pDmaDesc->ident = wIdent; /* area to use */ + pDmaDesc->size = 0; /* initialise other bits */ + pDmaDesc->offset = 0; dev_dbg(&ced->interface->dev, "%s: type: %d ident: %d\n", - __func__, pDmaDesc->wTransType, pDmaDesc->wIdent); + __func__, pDmaDesc->trans_type, pDmaDesc->ident); - pDmaDesc->bOutWard = (ucTransCode != TM_EXTTOHOST); /* set transfer direction */ + pDmaDesc->outward = (ucTransCode != TM_EXTTOHOST); /* set transfer direction */ switch (ucTransCode) { case TM_EXTTOHOST: /* Extended linear transfer modes (the only ones!) */ case TM_EXTTO1401: { bResult = - ced_read_huff(&(pDmaDesc->dwOffset), pBuf, + ced_read_huff(&(pDmaDesc->offset), pBuf, &dDone, dwCount) - && ced_read_huff(&(pDmaDesc->dwSize), pBuf, + && ced_read_huff(&(pDmaDesc->size), pBuf, &dDone, dwCount); if (bResult) { dev_dbg(&ced->interface->dev, "%s: xfer offset & size %d %d\n", - __func__, pDmaDesc->dwOffset, - pDmaDesc->dwSize); + __func__, pDmaDesc->offset, + pDmaDesc->size); if ((wIdent >= MAX_TRANSAREAS) || /* Illegal area number, or... */ (!ced->rTransDef[wIdent].used) || /* area not set up, or... */ - (pDmaDesc->dwOffset > ced->rTransDef[wIdent].length) || /* range/size */ - ((pDmaDesc->dwOffset + - pDmaDesc->dwSize) > + (pDmaDesc->offset > ced->rTransDef[wIdent].length) || /* range/size */ + ((pDmaDesc->offset + + pDmaDesc->size) > (ced->rTransDef[wIdent]. length))) { bResult = false; /* bad parameter(s) */ @@ -1000,8 +1000,8 @@ static bool ced_read_dma_info(volatile struct dmadesc *pDmaDesc, __func__, wIdent, ced->rTransDef[wIdent]. used, - pDmaDesc->dwOffset, - pDmaDesc->dwSize, + pDmaDesc->offset, + pDmaDesc->size, ced->rTransDef[wIdent]. length); } @@ -1049,13 +1049,13 @@ static int ced_handle_esc(struct ced_data *ced, char *pCh, spin_lock(&ced->stagedLock); /* Lock others out */ if (ced_read_dma_info(&ced->rDMAInfo, ced, pCh, dwCount)) { /* Get DMA parameters */ - unsigned short wTransType = ced->rDMAInfo.wTransType; /* check transfer type */ + unsigned short wTransType = ced->rDMAInfo.trans_type; /* check transfer type */ dev_dbg(&ced->interface->dev, "%s: xfer to %s, offset %d, length %d\n", __func__, - ced->rDMAInfo.bOutWard ? "1401" : "host", - ced->rDMAInfo.dwOffset, ced->rDMAInfo.dwSize); + ced->rDMAInfo.outward ? "1401" : "host", + ced->rDMAInfo.offset, ced->rDMAInfo.size); if (ced->bXFerWaiting) { /* Check here for badly out of kilter... */ /* This can never happen, really */ @@ -1066,11 +1066,10 @@ static int ced_handle_esc(struct ced_data *ced, char *pCh, || (wTransType == TM_EXTTO1401)) { iReturn = ced_read_write_mem(ced, - !ced->rDMAInfo. - bOutWard, - ced->rDMAInfo.wIdent, - ced->rDMAInfo.dwOffset, - ced->rDMAInfo.dwSize); + !ced->rDMAInfo.outward, + ced->rDMAInfo.ident, + ced->rDMAInfo.offset, + ced->rDMAInfo.size); if (iReturn != U14ERR_NOERROR) dev_err(&ced->interface->dev, "%s: ced_read_write_mem() failed %d\n", diff --git a/drivers/staging/ced1401/usb1401.h b/drivers/staging/ced1401/usb1401.h index 30001652089b..cb4e452b5e2f 100644 --- a/drivers/staging/ced1401/usb1401.h +++ b/drivers/staging/ced1401/usb1401.h @@ -125,14 +125,15 @@ struct transarea { /* area MUST BE LAST */ }; -/* 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. */ +/* 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. */ 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 */ + unsigned short trans_type; /* transfer type as TM_xxx above */ + unsigned short ident; /* identifier word */ + unsigned int size; /* bytes to transfer */ + unsigned int offset; /* offset into transfer area for trans */ + bool outward; /* true when data is going TO 1401 */ }; #define INBUF_SZ 256 /* input buffer size */ -- 2.34.1