Staging: ced1401: fix coding style in ced_ioc.c
PATCH 1/1 Staging: ced1401: fix coding style in ced_ioc.c
From: Pol Eyschen <[email protected]>
All comments fixed to match the kernel coding style.
--- drivers/staging/ced1401/ced_ioc.c | 382 ++++++++++++++++++++++++------------- 1 file changed, 249 insertions(+), 133 deletions(-)
drivers/staging/ced1401/ced_ioc.c +249 -133
@@ -41,7 +41,8 @@ static void FlushOutBuff(DEVICE_EXTENSION *pdx) {dev_dbg (&pdx->interface->dev,"%s currentState=%d" , __func__, pdx->sCurrentState); -if (pdx->sCurrentState ==U14ERR_TIME )/* Do nothing if hardware in trouble */ +if (pdx->sCurrentState ==U14ERR_TIME ) +/* Do nothing if hardware in trouble */ return ;/* Kill off any pending I/O */ /* CharSend_Cancel(pdx); */
@@ -62,7 +63,8 @@ static void FlushInBuff(DEVICE_EXTENSION *pdx) {dev_dbg (&pdx->interface->dev,"%s currentState=%d" , __func__, pdx->sCurrentState); -if (pdx->sCurrentState ==U14ERR_TIME )/* Do nothing if hardware in trouble */ +if (pdx->sCurrentState ==U14ERR_TIME ) +/* Do nothing if hardware in trouble */ return ;/* Kill off any pending I/O */ /* CharRead_Cancel(pDevObject); */
@@ -93,7 +95,8 @@ static int PutChars(DEVICE_EXTENSION *pdx, const char *pCh, } pdx->dwNumOutput += uCount;spin_unlock_irq (&pdx->charOutLock); - iReturn =SendChars (pdx);/* ...give a chance to transmit data */ +/* ...give a chance to transmit data */ + iReturn =SendChars (pdx); }else { iReturn =U14ERR_NOOUT ;/* no room at the out (ha-ha) */ spin_unlock_irq (&pdx->charOutLock);
@@ -110,7 +113,8 @@ int SendString(DEVICE_EXTENSION *pdx, const char __user *pData, unsigned int n) {int iReturn =U14ERR_NOERROR ;/* assume all will be well */ -char buffer[OUTBUF_SZ +1 ];/* space in our address space for characters */ +/* space in our address space for characters */ +char buffer[OUTBUF_SZ +1 ];if (n >OUTBUF_SZ )/* check space in local buffer... */ return U14ERR_NOOUT ;/* ...too many characters */ if (copy_from_user (buffer, pData, n))
@@ -184,7 +188,8 @@ int Get1401State(DEVICE_EXTENSION *pdx, __u32 *state, __u32 *error)if (nGot !=sizeof (pdx->statBuf)) {dev_err (&pdx->interface->dev,"Get1401State() FAILED, return code %d" , nGot); - pdx->sCurrentState =U14ERR_TIME ;/* Indicate that things are very wrong indeed */ +/* Indicate that things are very wrong indeed */ + pdx->sCurrentState =U14ERR_TIME ; *state =0 ;/* Force status values to a known state */ *error =0 ; }else {
@@ -193,16 +198,19 @@ int Get1401State(DEVICE_EXTENSION *pdx, __u32 *state, __u32 *error)"Get1401State() Success, state: 0x%x, 0x%x" , pdx->statBuf[0], pdx->statBuf[1]); - *state = pdx->statBuf[0 ];/* Return the state values to the calling code */ +/* Return the state values to the calling code */ + *state = pdx->statBuf[0 ]; *error = pdx->statBuf[1 ]; - nDevice = pdx->udev->descriptor.bcdDevice >>8 ;/* 1401 type code value */ +/* 1401 type code value */ + nDevice = pdx->udev->descriptor.bcdDevice >>8 ;switch (nDevice) {/* so we can clean up current state */ case 0 : pdx->sCurrentState =U14ERR_U1401 ;break ; -default :/* allow lots of device codes for future 1401s */ +default : +/* allow lots of device codes for future 1401s */ if ((nDevice >=1 ) && (nDevice <=23 )) pdx->sCurrentState = (short )(nDevice +6 );else
@@ -227,23 +235,33 @@ int ReadWrite_Cancel(DEVICE_EXTENSION *pdx)int ntStatus =STATUS_SUCCESS ;bool bResult = false;unsigned int i; -/* We can fill this in when we know how we will implement the staged transfer stuff */ +/* +* We can fill this in when we know how +* we will implement the staged transfer stuff +*/ spin_lock_irq (&pdx->stagedLock); -if (pdx->bStagedUrbPending) {/* anything to be cancelled? May need more... */ +if (pdx->bStagedUrbPending) { +/* anything to be cancelled? May need more... */ dev_info (&pdx->interface - dev,"ReadWrite_Cancel about to cancel Urb" );/* Clear the staging done flag */ /* KeClearEvent(&pdx->StagingDoneEvent); */ USB_ASSERT (pdx->pStagedIrp !=NULL ); -/* Release the spinlock first otherwise the completion routine may hang */ -/* on the spinlock while this function hands waiting for the event. */ +/* +*Release the spinlock first otherwise the completation +* routine may hang on the spinlock while this function hands +* waiting for the event. +*/ +spin_unlock_irq (&pdx->stagedLock); - bResult =IoCancelIrp (pdx->pStagedIrp);/* Actually do the cancel */ +/* Actually do the cancel */ + bResult =IoCancelIrp (pdx->pStagedIrp);if (bResult) {LARGE_INTEGER timeout; - timeout.QuadPart =-10000000 ;/* Use a timeout of 1 second */ +/* Use a timeout of 1 second */ + timeout.QuadPart =-10000000 ;dev_info (&pdx->interface - dev,"ReadWrite_Cancel about to wait till done" ); ntStatus =
@@ -276,10 +294,12 @@ int ReadWrite_Cancel(DEVICE_EXTENSION *pdx)static int InSelfTest (DEVICE_EXTENSION *pdx,unsigned int *pState) {unsigned int state, error; -int iReturn =Get1401State (pdx, &state, &error);/* see if in self-test */ +/* see if in self-test */ +int iReturn =Get1401State (pdx, &state, &error);if (iReturn ==U14ERR_NOERROR )/* if all still OK */ - iReturn = (state == (unsigned int )-1 ) ||/* TX problem or... */ - ((state &0xff ) ==0x80 );/* ...self test */ +/* TX problem or self test */ + iReturn = (state == (unsigned int )-1 ) || + ((state &0xff ) ==0x80 ); *pState = state;/* return actual state */ return iReturn; }
@@ -311,15 +331,22 @@ bool Is1401(DEVICE_EXTENSION *pdx)FlushInBuff (pdx);/* Clear out input buffer & pipe */ FlushOutBuff (pdx);/* Clear output buffer & pipe */ -/* The next call returns 0 if OK, but has returned 1 in the past, meaning that */ -/* usb_unlock_device() is needed... now it always is */ +/* +* The next call returns 0 if OK, but has returned 1 in the past, +* meaning that usb_unlock_device() is needed... now it always is +*/ iReturn =usb_lock_device_for_reset (pdx->udev, pdx->interface); -/* release the io_mutex because if we don't, we will deadlock due to system */ -/* calls back into the driver. */ -mutex_unlock (&pdx->io_mutex);/* locked, so we will not get system calls */ -if (iReturn >=0 ) {/* if we failed */ - iReturn =usb_reset_device (pdx->udev);/* try to do the reset */ +/* +* release the io_mutex because if we don't, we will deadlock +* due to system calls back into the driver. +*/ + +mutex_unlock (&pdx->io_mutex); +/* locked, so we will not get system calls */ +if (iReturn >=0 ) { +/* if we failed try to do the reset */ + iReturn =usb_reset_device (pdx->udev);usb_unlock_device (pdx->udev);/* undo the lock */ }
@@ -327,17 +354,21 @@ bool Is1401(DEVICE_EXTENSION *pdx) pdx->dwDMAFlag =MODE_CHAR ;/* Clear DMA mode flag regardless! */ if (iReturn ==0 ) {/* if all is OK still */ unsigned int state; - iReturn =InSelfTest (pdx, &state);/* see if likely in self test */ +/* see if likely in self test */ + iReturn =InSelfTest (pdx, &state);if (iReturn >0 ) {/* do we need to wait for self-test? */ -unsigned long ulTimeOut = jiffies +30 *HZ ;/* when to give up */ +/* when to give up */ +unsigned long ulTimeOut = jiffies +30 *HZ ;while ((iReturn >0 ) &&time_before (jiffies, ulTimeOut)) {schedule ();/* let other stuff run */ - iReturn =InSelfTest (pdx, &state);/* see if done yet */ +/* see if done yet */ + iReturn =InSelfTest (pdx, &state); } }if (iReturn ==0 )/* if all is OK... */ - iReturn = state ==0 ;/* then success is that the state is 0 */ +/* then success is that the state is 0 */ + iReturn = state ==0 ; }else iReturn =0 ;/* we failed */ pdx->bForceReset = false;/* Clear forced reset flag now */
@@ -364,29 +395,38 @@ bool QuickCheck(DEVICE_EXTENSION *pdx, bool bTestBuff, bool bCanReset)bool bRet = false;/* assume it will fail and we will reset */ bool bShortTest; - bShortTest = ((pdx->dwDMAFlag ==MODE_CHAR ) &&/* no DMA running */ - (!pdx->bForceReset) &&/* Not had a real reset forced */ - (pdx->sCurrentState >=U14ERR_STD ));/* No 1401 errors stored */ +/* +* no DMA running, did not have a real reset forced +* and no 1401 errors stored. +*/ + + bShortTest = ((pdx->dwDMAFlag ==MODE_CHAR ) && + (!pdx->bForceReset) && + (pdx->sCurrentState >=U14ERR_STD ));dev_dbg (&pdx->interface->dev,"%s DMAFlag:%d, state:%d, force:%d, testBuff:%d, short:%d" , __func__, pdx->dwDMAFlag, pdx->sCurrentState, pdx->bForceReset, bTestBuff, bShortTest); -if ((bTestBuff) &&/* Buffer check requested, and... */ - (pdx->dwNumInput || pdx->dwNumOutput)) {/* ...characters were in the buffer? */ +/* Buffer check requested, and characters were in the buffer? */ +if ((bTestBuff) && (pdx->dwNumInput || pdx->dwNumOutput)) { bShortTest = false;/* Then do the full test */ dev_dbg (&pdx->interface->dev,"%s will reset as buffers not empty" , __func__); }if (bShortTest || !bCanReset) {/* Still OK to try the short test? */ -/* Always test if no reset - we want state update */ +/* Always test if no reset - we want state update */ unsigned int state, error;dev_dbg (&pdx->interface->dev,"%s->Get1401State" , __func__); -if (Get1401State (pdx, &state, &error) ==U14ERR_NOERROR ) {/* Check on the 1401 state */ -if ((state &0xFF ) ==0 )/* If call worked, check the status value */ - bRet = true;/* If that was zero, all is OK, no reset needed */ +/* Check on the 1401 state */ +if (Get1401State (pdx, &state, &error) ==U14ERR_NOERROR ) { +/* If call worked, check the status value */ +if ((state &0xFF ) ==0 ) +/* If that was zero, all is OK, +* no reset needed */ + bRet = true; } }
@@ -473,7 +513,8 @@ int GetString(DEVICE_EXTENSION *pdx, char __user *pUser, int n) nAvailable = n;/* ...or input characters */ if (nAvailable >0 ) {/* worth looking? */ -char buffer[INBUF_SZ +1 ];/* space for a linear copy of data */ +/* space for a linear copy of data */ +char buffer[INBUF_SZ +1 ];int nGot =0 ;int nCopyToUser;/* number to copy to user */ char cData;
@@ -483,7 +524,8 @@ int GetString(DEVICE_EXTENSION *pdx, char __user *pUser, int n) cData = (char )0 ;if (pdx->dwInBuffGet >=INBUF_SZ ) - pdx->dwInBuffGet =0 ;/* wrap buffer pointer */ +/* wrap buffer pointer */ + pdx->dwInBuffGet =0 ; buffer[nGot++] = cData;/* save the output */ }while ((nGot < nAvailable) && cData);
@@ -544,13 +586,16 @@ int LineCount(DEVICE_EXTENSION *pdx)spin_lock_irq (&pdx->charInLock);/* Get protection */ if (pdx->dwNumInput >0 ) {/* worth looking? */ -unsigned int dwIndex = pdx->dwInBuffGet;/* start at first available */ -unsigned int dwEnd = pdx->dwInBuffPut;/* Position for search end */ +/* start at first available */ +unsigned int dwIndex = pdx->dwInBuffGet; +/* Position for search end */ +unsigned int dwEnd = pdx->dwInBuffPut;do {if (pdx->inputBuffer[dwIndex++] ==CR_CHAR ) ++iReturn;/* inc count if CR */ -if (dwIndex >=INBUF_SZ )/* see if we fall off buff */ +/* see if we fall off buff */ +if (dwIndex >=INBUF_SZ ) dwIndex =0 ; }while (dwIndex != dwEnd);/* go to last available */ }
@@ -571,7 +616,8 @@ int GetOutBufSpace(DEVICE_EXTENSION *pdx)int iReturn;mutex_lock (&pdx->io_mutex);/* Protect disconnect from new i/o */ SendChars (pdx);/* send any buffered chars */ - iReturn = (int )(OUTBUF_SZ - pdx->dwNumOutput);/* no lock needed for single read */ +/* no lock needed for single read */ + iReturn = (int )(OUTBUF_SZ - pdx->dwNumOutput);dev_dbg (&pdx->interface->dev,"OutBufSpace %d" , iReturn);mutex_unlock (&pdx->io_mutex);/* Protect disconnect from new i/o */ return iReturn;
@@ -593,12 +639,15 @@ int ClearArea(DEVICE_EXTENSION *pdx, int nArea)dev_err (&pdx->interface->dev,"%s Attempt to clear area %d" , __func__, nArea); }else { -TRANSAREA *pTA = &pdx->rTransDef[nArea];/* to save typing */ -if (!pTA->bUsed)/* if not used... */ - iReturn =U14ERR_NOTSET ;/* ...nothing to be done */ +/* to save typing */ +TRANSAREA *pTA = &pdx->rTransDef[nArea]; +if (!pTA->bUsed) +/* if not used, nothing to be done */ + iReturn =U14ERR_NOTSET ;else { -/* We must save the memory we return as we shouldn't mess with memory while */ -/* holding a spin lock. */ +/* We must save the memory we return as +* we shouldn't mess with memory while +* holding a spin lock. */ struct page **pPages =NULL ;/*save page address list*/ int nPages =0 ;/* and number of pages */ int np;
@@ -608,32 +657,44 @@ int ClearArea(DEVICE_EXTENSION *pdx, int nArea)spin_lock_irq (&pdx->stagedLock);if ((pdx->StagedId == nArea) && (pdx->dwDMAFlag >MODE_CHAR )) { - iReturn =U14ERR_UNLOCKFAIL ;/* cannot delete as in use */ +/* cannot delete as in use */ + iReturn =U14ERR_UNLOCKFAIL ;dev_err (&pdx->interface->dev,"%s call on area %d while active" , __func__, nArea); }else { - pPages = pTA->pPages;/* save page address list */ - nPages = pTA->nPages;/* and page count */ -if (pTA->dwEventSz)/* if events flagging in use */ -wake_up_interruptible (&pTA->wqEvent);/* release anything that was waiting */ +/* save page address list and page count */ + pPages = pTA->pPages; + nPages = pTA->nPages; +if (pTA->dwEventSz) +/* if events flagging in use +* release anything that was waiting */ +wake_up_interruptible (&pTA->wqEvent);if (pdx->bXFerWaiting && (pdx->rDMAInfo.wIdent == nArea)) - pdx->bXFerWaiting = false;/* Cannot have pending xfer if area cleared */ - -/* Clean out the TRANSAREA except for the wait queue, which is at the end */ -/* This sets bUsed to false and dwEventSz to 0 to say area not used and no events. */ +/* Cannot have pending xfer if +* area cleared */ + pdx->bXFerWaiting = false; + +/* Clean out the TRANSAREA except for the +* wait queue, which is at the end. +* This sets bUsed to false and dwEventSz +* to 0 to say area not used and no events. */ memset (pTA,0 ,sizeof (TRANSAREA ) -sizeof (wait_queue_head_t)); }spin_unlock_irq (&pdx->stagedLock); -if (pPages) {/* if we decided to release the memory */ -/* Now we must undo the pinning down of the pages. We will assume the worst and mark */ -/* all the pages as dirty. Don't be tempted to move this up above as you must not be */ -/* holding a spin lock to do this stuff as it is not atomic. */ +if (pPages) { +/* If we decided to release the memory, we +* must undo the pinning down of the +* pages. We will assume the worst and mark +* all the pages as dirty. Don't be tempted to +* move this up above as you must not be +* holding a spin lock to do this stuff as it +* is not atomic. */ dev_dbg (&pdx->interface->dev,"%s nPages=%d" , __func__, nPages);
@@ -663,9 +724,9 @@ int ClearArea(DEVICE_EXTENSION *pdx, int nArea)static int SetArea (DEVICE_EXTENSION *pdx,int nArea,char __user *puBuf,unsigned int dwLength,bool bCircular,bool bCircToHost) { -/* Start by working out the page aligned start of the area and the size */ -/* of the area in pages, allowing for the start not being aligned and the */ -/* end needing to be rounded up to a page boundary. */ +/* Start by working out the page aligned start of the area and the size +* of the area in pages, allowing for the start not being aligned and +* the end needing to be rounded up to a page boundary. */ unsigned long ulStart = ((unsigned long )puBuf) &PAGE_MASK ;unsigned int ulOffset = ((unsigned long )puBuf) & (PAGE_SIZE -1 );int len = (dwLength + ulOffset +PAGE_SIZE -1 ) >>PAGE_SHIFT ;
@@ -674,15 +735,18 @@ static int SetArea(DEVICE_EXTENSION *pdx, int nArea, char __user *puBuf,struct page **pPages =NULL ;/* space for page tables */ int nPages =0 ;/* and number of pages */ -int iReturn =ClearArea (pdx, nArea);/* see if OK to use this area */ -if ((iReturn !=U14ERR_NOTSET ) &&/* if not area unused and... */ - (iReturn !=U14ERR_NOERROR ))/* ...not all OK, then... */ -return iReturn;/* ...we cannot use this area */ +int iReturn =ClearArea (pdx, nArea);/* see if OK to use this area */ +if ((iReturn !=U14ERR_NOTSET ) &&/* if not area unused and... */ + (iReturn !=U14ERR_NOERROR ))/* ...not all OK, then... */ +return iReturn;/* ...we cannot use this area */ -if (!access_ok (VERIFY_WRITE , puBuf, dwLength))/* if we cannot access the memory... */ -return -EFAULT ;/* ...then we are done */ +if (!access_ok (VERIFY_WRITE , puBuf, dwLength)) +/* if we cannot access the memory we are done */ +return -EFAULT ; -/* Now allocate space to hold the page pointer and virtual address pointer tables */ +/* Now allocate space to hold the page pointer and virtual +* address pointer tables +*/ pPages =kmalloc (len *sizeof (struct page *),GFP_KERNEL );if (!pPages) { iReturn =U14ERR_NOMEMORY ;
@@ -691,19 +755,25 @@ static int SetArea(DEVICE_EXTENSION *pdx, int nArea, char __user *puBuf,dev_dbg (&pdx->interface->dev,"%s %p, length=%06x, circular %d" , __func__, puBuf, dwLength, bCircular); -/* To pin down user pages we must first acquire the mapping semaphore. */ +/* To pin down user pages we must first acquire the mapping semaphore.*/ nPages =get_user_pages_fast (ulStart, len,1 , pPages);dev_dbg (&pdx->interface->dev,"%s nPages = %d" , __func__, nPages);if (nPages >0 ) {/* if we succeeded */ -/* If you are tempted to use page_address (form LDD3), forget it. You MUST use */ -/* kmap() or kmap_atomic() to get a virtual address. page_address will give you */ -/* (null) or at least it does in this context with an x86 machine. */ +/* If you are tempted to use page_address (form LDD3), +* forget it. You MUST use kmap() or kmap_atomic() to get a +* virtual address. page_address will give you (null) or at +* least it does in this context with an x86 machine. +*/ spin_lock_irq (&pdx->stagedLock); - pTA->lpvBuff = puBuf;/* keep start of region (user address) */ - pTA->dwBaseOffset = ulOffset;/* save offset in first page to start of xfer */ - pTA->dwLength = dwLength;/* Size if the region in bytes */ - pTA->pPages = pPages;/* list of pages that are used by buffer */ +/* keep start of region (user address) */ + pTA->lpvBuff = puBuf; +/* save offset in first page to start of xfer */ + pTA->dwBaseOffset = ulOffset; +/* Size if the region in bytes */ + pTA->dwLength = dwLength; +/* list of pages that are used by buffer */ + pTA->pPages = pPages; pTA->nPages = nPages;/* number of pages */ pTA->bCircular = bCircular;
@@ -747,9 +817,11 @@ int SetTransfer(DEVICE_EXTENSION *pdx, TRANSFERDESC __user *pTD)mutex_lock (&pdx->io_mutex);dev_dbg (&pdx->interface->dev,"%s area:%d, size:%08x" , __func__, td.wAreaNum, td.dwLength); -/* The strange cast is done so that we don't get warnings in 32-bit linux about the size of the */ -/* pointer. The pointer is always passed as a 64-bit object so that we don't have problems using */ -/* a 32-bit program on a 64-bit system. unsigned long is 64-bits on a 64-bit system. */ +/* The strange cast is done so that we don't get warnings in 32-bit +* linux about the size of the pointer. The pointer is always passed as +* a 64-bit object so that we don't have problems using a 32-bit program +* on a 64-bit system. unsigned long is 64-bits on a 64-bit system. +*/ iReturn = SetArea(pdx, td.wAreaNum, (char __user *)((unsigned long)td.lpvBuff), td.dwLength,
@@ -792,12 +864,16 @@ int SetEvent(DEVICE_EXTENSION *pdx, TRANSFEREVENT __user *pTE)return U14ERR_BADAREA ; else {TRANSAREA *pTA = &pdx->rTransDef[te.wAreaNum]; -mutex_lock (&pdx->io_mutex);/* make sure we have no competitor */ +/* make sure we have no competitor */ +mutex_lock (&pdx->io_mutex);spin_lock_irq (&pdx->stagedLock);if (pTA->bUsed) {/* area must be in use */ - pTA->dwEventSt = te.dwStart;/* set area regions */ - pTA->dwEventSz = te.dwLength;/* set size (0 cancels it) */ - pTA->bEventToHost = te.wFlags &1 ;/* set the direction */ + pTA->dwEventSt = te.dwStart; +/* set area regions, set size (0 cancels it) and set +* the direction +*/ + pTA->dwEventSz = te.dwLength; + pTA->bEventToHost = te.wFlags &1 ; pTA->iWakeUp =0 ;/* zero the wake up count */ }else iReturn =U14ERR_NOTSET ;
@@ -822,15 +898,20 @@ int WaitEvent(DEVICE_EXTENSION *pdx, int nArea, int msTimeOut)else {int iWait;TRANSAREA *pTA = &pdx->rTransDef[nArea]; - msTimeOut = (msTimeOut *HZ +999 ) /1000 ;/* convert timeout to jiffies */ - -/* We cannot wait holding the mutex, but we check the flags while holding */ -/* it. This may well be pointless as another thread could get in between */ -/* releasing it and the wait call. However, this would have to clear the */ -/* iWakeUp flag. However, the !pTA-bUsed may help us in this case. */ -mutex_lock (&pdx->io_mutex);/* make sure we have no competitor */ -if (!pTA->bUsed || !pTA->dwEventSz)/* check something to wait for... */ -return U14ERR_NOTSET ;/* ...else we do nothing */ +/* convert timeout to jiffies */ + msTimeOut = (msTimeOut *HZ +999 ) /1000 ; + +/* We cannot wait holding the mutex, but we check the flags +* while holding it. This may well be pointless as another +* thread could get in between releasing it and the wait call. +* However, this would have to clear the iWakeUp flag. +* However, the !pTA-bUsed may help us in this case. +*/ +/* make sure we have no competitor */ +mutex_lock (&pdx->io_mutex); +if (!pTA->bUsed || !pTA->dwEventSz) +/* if there is nothing to wait for, we do nothing */ +return U14ERR_NOTSET ;mutex_unlock (&pdx->io_mutex);if (msTimeOut)
@@ -844,7 +925,8 @@ int WaitEvent(DEVICE_EXTENSION *pdx, int nArea, int msTimeOut)wait_event_interruptible (pTA->wqEvent, pTA->iWakeUp || !pTA->bUsed);if (iWait) - iReturn = -ERESTARTSYS ;/* oops - we have had a SIGNAL */ +/* oops - we have had a SIGNAL */ + iReturn = -ERESTARTSYS ;else iReturn = pTA->iWakeUp;/* else the wakeup count */
@@ -868,7 +950,8 @@ int TestEvent(DEVICE_EXTENSION *pdx, int nArea) iReturn =U14ERR_BADAREA ; else {TRANSAREA *pTA = &pdx->rTransDef[nArea]; -mutex_lock (&pdx->io_mutex);/* make sure we have no competitor */ +/* make sure we have no competitor */ +mutex_lock (&pdx->io_mutex);spin_lock_irq (&pdx->stagedLock); iReturn = pTA->iWakeUp;/* get wakeup count since last call */ pTA->iWakeUp =0 ;/* clear the count */
@@ -892,7 +975,9 @@ int GetTransfer(DEVICE_EXTENSION *pdx, TGET_TX_BLOCK __user *pTX)if (dwIdent >=MAX_TRANSAREAS ) iReturn =U14ERR_BADAREA ;else { -/* Return the best information we have - we don't have physical addresses */ +/* Return the best information we have - +* we don't have physical addresses. +*/ TGET_TX_BLOCK *tx; tx =kzalloc (sizeof (*tx),GFP_KERNEL );
@@ -902,7 +987,8 @@ int GetTransfer(DEVICE_EXTENSION *pdx, TGET_TX_BLOCK __user *pTX) } tx->size = pdx->rTransDef[dwIdent].dwLength; tx->linear = (long long )((long )pdx->rTransDef[dwIdent].lpvBuff); - tx->avail =GET_TX_MAXENTRIES ;/* how many blocks we could return */ +/* how many blocks we could return */ + tx->avail =GET_TX_MAXENTRIES ; tx->used =1 ;/* number we actually return */ tx->entries[0 ].physical = (long long )(tx->linear + pdx->StagedOffset);
@@ -984,7 +1070,8 @@ int StartSelfTest(DEVICE_EXTENSION *pdx) nGot =usb_control_msg (pdx->udev,usb_rcvctrlpipe (pdx->udev,0 ),DB_SELFTEST , (H_TO_D |VENDOR |DEVREQ ),0 ,0 ,NULL ,0 ,HZ );/* allow 1 second timeout */ - pdx->ulSelfTestTime = jiffies +HZ *30 ;/* 30 seconds into the future */ +/* 30 seconds into the future */ + pdx->ulSelfTestTime = jiffies +HZ *30 ;mutex_unlock (&pdx->io_mutex);if (nGot <0 )
@@ -1008,11 +1095,13 @@ int CheckSelfTest(DEVICE_EXTENSION *pdx, TGET_SELFTEST __user *pGST)dev_dbg (&pdx->interface->dev,"%s" , __func__); iReturn =Get1401State (pdx, &state, &error); -if (iReturn ==U14ERR_NOERROR )/* Only accept zero if it happens twice */ +if (iReturn ==U14ERR_NOERROR ) iReturn =Get1401State (pdx, &state, &error); - -if (iReturn !=U14ERR_NOERROR ) {/* Self-test can cause comms errors */ -/* so we assume still testing */ +/* Only accept zero if it happens twice */ +if (iReturn !=U14ERR_NOERROR ) { +/* Self-test can cause comms errors +* so we assume still testing +*/ dev_err (&pdx->interface->dev,"%s Get1401State=%d, assuming still testing" , __func__, iReturn);
@@ -1021,7 +1110,8 @@ int CheckSelfTest(DEVICE_EXTENSION *pdx, TGET_SELFTEST __user *pGST) iReturn =U14ERR_NOERROR ; } -if ((state ==-1 ) && (error ==-1 )) {/* If Get1401State had problems */ +if ((state ==-1 ) && (error ==-1 )) { +/* If Get1401State had problems */ dev_err (&pdx->interface->dev,"%s Get1401State failed, assuming still testing" , __func__);
@@ -1031,9 +1121,10 @@ int CheckSelfTest(DEVICE_EXTENSION *pdx, TGET_SELFTEST __user *pGST)if ((state &0xFF ) ==0x80 ) {/* If we are still in self-test */ if (state &0x00FF0000 ) {/* Have we got an error? */ - gst.code = (state &0x00FF0000 ) >>16 ;/* read the error code */ - gst.x = error &0x0000FFFF ;/* Error data X */ - gst.y = (error &0xFFFF0000 ) >>16 ;/* and data Y */ +/* read the error code */ + gst.code = (state &0x00FF0000 ) >>16 ; + gst.x = error &0x0000FFFF ;/* Error data X */ + gst.y = (error &0xFFFF0000 ) >>16 ;/* and data Y */ dev_dbg (&pdx->interface->dev,"Self-test error code %d" , gst.code); }else {/* No error, check for timeout */
@@ -1052,11 +1143,12 @@ int CheckSelfTest(DEVICE_EXTENSION *pdx, TGET_SELFTEST __user *pGST) }if (gst.code <0 ) {/* If we have a problem or finished */ -/* If using the 2890 we should reset properly */ +/* If using the 2890 we should reset properly */ if ((pdx->nPipes ==4 ) && (pdx->s1401Type <=TYPEPOWER ))Is1401 (pdx);/* Get 1401 reset and OK */ else -QuickCheck (pdx, true, true);/* Otherwise check without reset unless problems */ +/* Otherwise check without reset unless problems */ +QuickCheck (pdx, true, true); }mutex_unlock (&pdx->io_mutex);
@@ -1089,7 +1181,8 @@ int TypeOf1401(DEVICE_EXTENSION *pdx)break ;default :if ((pdx->s1401Type >=TYPEPOWER ) && (pdx->s1401Type <=25 )) - iReturn = pdx->s1401Type +4 ;/* We can calculate types */ +/* We can calculate types */ + iReturn = pdx->s1401Type +4 ;else /* for up-coming 1401 designs */ iReturn =TYPEUNKNOWN ;/* Don't know or not there */ }
@@ -1106,8 +1199,11 @@ int TypeOf1401(DEVICE_EXTENSION *pdx)****************************************************************************/ int TransferFlags (DEVICE_EXTENSION *pdx) { -int iReturn =U14TF_MULTIA |U14TF_DIAG |/* we always have multiple DMA area */ -U14TF_NOTIFY |U14TF_CIRCTH ;/* diagnostics, notify and circular */ +/* We always have multiple DMA area +* diagnostics, notify and circular +*/ +int iReturn =U14TF_MULTIA |U14TF_DIAG | +U14TF_NOTIFY |U14TF_CIRCTH ;dev_dbg (&pdx->interface->dev,"%s" , __func__);mutex_lock (&pdx->io_mutex);if (pdx->bIsUSB2)/* Set flag for USB2 if appropriate */
@@ -1199,8 +1295,8 @@ int DbgPoke(DEVICE_EXTENSION *pdx, TDBGBLOCK __user *pDB)/**************************************************************************** ** DbgRampData ** -** Execute the diagnostic ramp data operation. Parameters are in the CSBLOCK struct -** in order address, default, enable mask, size and repeats. +** Execute the diagnostic ramp data operation. Parameters are in the CSBLOCK +** struct in order address, default, enable mask, size and repeats. ****************************************************************************/ int DbgRampData (DEVICE_EXTENSION *pdx,TDBGBLOCK __user *pDB) {
@@ -1332,9 +1428,11 @@ int SetCircular(DEVICE_EXTENSION *pdx, TRANSFERDESC __user *pTD) td.wAreaNum, td.dwLength); bToHost = td.eSize !=0 ;/* this is used as the tohost flag */ -/* The strange cast is done so that we don't get warnings in 32-bit linux about the size of the */ -/* pointer. The pointer is always passed as a 64-bit object so that we don't have problems using */ -/* a 32-bit program on a 64-bit system. unsigned long is 64-bits on a 64-bit system. */ +/* The strange cast is done so that we don't get warnings in 32-bit +* linux about the size of the pointer. The pointer is always passed as +* a 64-bit object so that we don't have problems using a 32-bit program +* on a 64-bit system. unsigned long is 64-bits on a 64-bit system. +*/ iReturn = SetArea(pdx, td.wAreaNum, (char __user *)((unsigned long)td.lpvBuff), td.dwLength,
@@ -1366,12 +1464,16 @@ int GetCircBlock(DEVICE_EXTENSION *pdx, TCIRCBLOCK __user *pCB) cb.dwSize =0 ;if (nArea <MAX_TRANSAREAS ) {/* The area number must be OK */ -TRANSAREA *pArea = &pdx->rTransDef[nArea];/* Pointer to relevant info */ +/* Pointer to relevant info */ +TRANSAREA *pArea = &pdx->rTransDef[nArea];spin_lock_irq (&pdx->stagedLock);/* Lock others out */ -if ((pArea->bUsed) && (pArea->bCircular) &&/* Must be circular area */ - (pArea->bCircToHost)) {/* For now at least must be to host */ -if (pArea->aBlocks[0 ].dwSize >0 ) {/* Got anything? */ +/* Must be circular area */ +if ((pArea->bUsed) && (pArea->bCircular) && + (pArea->bCircToHost)) { +/* For now at least must be to host */ +if (pArea->aBlocks[0 ].dwSize >0 ) { +/* Got anything? */ cb.dwOffset = pArea->aBlocks[0 ].dwOffset; cb.dwSize = pArea->aBlocks[0 ].dwSize; dev_dbg(&pdx->interface->dev,
@@ -1417,21 +1519,32 @@ int FreeCircBlock(DEVICE_EXTENSION *pdx, TCIRCBLOCK __user *pCB) cb.dwSize =0 ;if (nArea <MAX_TRANSAREAS ) {/* The area number must be OK */ -TRANSAREA *pArea = &pdx->rTransDef[nArea];/* Pointer to relevant info */ +/* Pointer to relevant info */ +TRANSAREA *pArea = &pdx->rTransDef[nArea];spin_lock_irq (&pdx->stagedLock);/* Lock others out */ -if ((pArea->bUsed) && (pArea->bCircular) &&/* Must be circular area */ - (pArea->bCircToHost)) {/* For now at least must be to host */ +/* Must be circular area */ +if ((pArea->bUsed) && (pArea->bCircular) && + (pArea->bCircToHost)) { +/* For now at least must be to host */ bool bWaiting = false; -if ((pArea->aBlocks[0 ].dwSize >= uSize) &&/* Got anything? */ - (pArea->aBlocks[0 ].dwOffset == uStart)) {/* Must be legal data */ +/* Got anything? and must be legal data */ +if ((pArea->aBlocks[0 ].dwSize >= uSize) && + (pArea->aBlocks[0 ].dwOffset == uStart)) { pArea->aBlocks[0 ].dwSize -= uSize; pArea->aBlocks[0 ].dwOffset += uSize; -if (pArea->aBlocks[0 ].dwSize ==0 ) {/* Have we emptied this block? */ -if (pArea->aBlocks[1 ].dwSize) {/* Is there a second block? */ - pArea->aBlocks[0 ] = pArea->aBlocks[1 ];/* Copy down block 2 data */ - pArea->aBlocks[1 ].dwSize =0 ;/* and mark the second block as unused */ +/* Have we emptied this block? */ +if (pArea->aBlocks[0 ].dwSize ==0 ) { +/* Is there a second block? */ +if (pArea->aBlocks[1 ].dwSize) { +/* Copy down block 2 data +* and mark the second block as +* unused. +*/ + pArea->aBlocks[0 ] = + pArea->aBlocks[1 ]; + pArea->aBlocks[1 ].dwSize =0 ; pArea->aBlocks[1 ].dwOffset =0 ; }else pArea->aBlocks[0 ].dwOffset =0 ;
@@ -1444,8 +1557,11 @@ int FreeCircBlock(DEVICE_EXTENSION *pdx, TCIRCBLOCK __user *pCB) pArea->aBlocks[0 ].dwOffset, pdx->bXFerWaiting); -/* Return the next available block of memory as well */ -if (pArea->aBlocks[0 ].dwSize >0 ) {/* Got anything? */ +/* Return the next available block of +* memory as well +*/ +/* Got anything? */ +if (pArea->aBlocks[0 ].dwSize >0 ) { cb.dwOffset = pArea->aBlocks[0 ].dwOffset; cb.dwSize = pArea->aBlocks[0 ].dwSize;
Signature · 1 line
1.7.10.4
Quoted 6 lines · Pol Eyschen
From: Pol Eyschen <[email protected]>
All comments fixed to match the kernel coding style.
Signed-off-by Pol Eyschen <[email protected]>---
This patch doesn't apply to my staging-next branch. Are you making your changes to the staging-next branch ofgit://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git?
Quoted 8 lines
drivers/staging/ced1401/ced_ioc.c | 382 ++++++++++++++++++++++++------------- 1 file changed, 249 insertions(+), 133 deletions(-)drivers/staging/ced1401/ced_ioc.c +0
-0
drivers/staging/ced1401/ced_ioc.c static void FlushOutBuff(DEVICE_EXTENSION *pdx) · line 46
Quoted 7 lines
drivers/staging/ced1401/ced_ioc.c +2
-1@@ -41,7 +41,8 @@ static void FlushOutBuff(DEVICE_EXTENSION *pdx) {dev_dbg (&pdx->interface->dev,"%s currentState=%d" , __func__, pdx->sCurrentState); -if (pdx->sCurrentState ==U14ERR_TIME )/* Do nothing if hardware in trouble */ +if (pdx->sCurrentState ==U14ERR_TIME ) +/* Do nothing if hardware in trouble */ return ;
Putting a comment after a single line 'if' and before the statement is not the norm and can be confusing. Please don't do it.
Also, quite a few of the comments you're moving around here look to be unecessary, and can probably be deleted.
Mark
Quoted 15 lines · Mark Einon
Quoted 6 lines · Pol Eyschen
From: Pol Eyschen <[email protected]>
All comments fixed to match the kernel coding style.
Signed-off-by Pol Eyschen <[email protected]>---
This patch doesn't apply to my staging-next branch. Are you making your changes to the staging-next branch of
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git?Quoted 3 lines
drivers/staging/ced1401/ced_ioc.c | 382 ++++++++++++++++++++++++------------- 1 file changed, 249 insertions(+), 133 deletions(-)
Quoted 16 lines
drivers/staging/ced1401/ced_ioc.c static void FlushOutBuff(DEVICE_EXTENSION *pdx) · line 46
Quoted 12 lines
drivers/staging/ced1401/ced_ioc.c +2
-1@@ -41,7 +41,8 @@ static void FlushOutBuff(DEVICE_EXTENSION *pdx) {dev_dbg (&pdx->interface->dev,"%s currentState=%d" , __func__, pdx->sCurrentState); -if (pdx->sCurrentState ==U14ERR_TIME )/* Do nothing if hardware in trouble */ +if (pdx->sCurrentState ==U14ERR_TIME ) +/* Do nothing if hardware in trouble */ return ;Putting a comment after a single line 'if' and before the statement is not the norm and can be confusing. Please don't do it.
The guideline is that multi-line indents should get {} braces for readability even though they aren't needed for syntax.
if (pdx->sCurrentState == U14ERR_TIME) {
/* Do nothing if hardware in trouble */
return;
}regards,
dan carpenter
Quoted 6 lines · Dan Carpenter
Quoted 5 lines · Mark Einon
Quoted 4 lines · Pol Eyschen
From: Pol Eyschen <[email protected]>
All comments fixed to match the kernel coding style.
Quoted 7 lines
Quoted 7 lines
Quoted 2 lines
Signed-off-by Pol Eyschen <[email protected]>---
This patch doesn't apply to my staging-next branch. Are you making your changes to the staging-next branch of
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git?
I cloned git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git and made my changes to that branch.
Quoted 19 lines
Quoted 19 lines
Quoted 8 lines
drivers/staging/ced1401/ced_ioc.c| 382 ++++++++++++++++++++++++-------------1 file changed, 249 insertions(+), 133 deletions(-)drivers/staging/ced1401/ced_ioc.c +0
-0drivers/staging/ced1401/ced_ioc.c static void FlushOutBuff(DEVICE_EXTENSION *pdx) · line 46
Quoted 7 lines
drivers/staging/ced1401/ced_ioc.c +2
-1@@ -41,7 +41,8 @@ static void FlushOutBuff(DEVICE_EXTENSION *pdx) {dev_dbg (&pdx->interface->dev,"%s currentState=%d" , __func__, pdx->sCurrentState); -if (pdx->sCurrentState ==U14ERR_TIME )/* Do nothing if hardware in trouble */ +if (pdx->sCurrentState ==U14ERR_TIME ) +/* Do nothing if hardware in trouble */ return ;Putting a comment after a single line 'if' and before the statement is not the norm and can be confusing. Please don't do it.
Quoted 8 lines
The guideline is that multi-line indents should get {} braces for readability even though they aren't needed for syntax.
if (pdx->sCurrentState == U14ERR_TIME) { /* Do nothing if hardware in trouble */ return; }
I took the original comments that were there, and just formatted them to be in order with the coding style, I didn't add or remove anything. This is my first patch so I didn't want to mess too much with what was there before, even if the comments sometimes seemed superfluous to me.
Pol
Quoted 6 lines · Pol Eyschen
Quoted 1 line
I took the original comments that were there, and just formatted them to be in order with the coding style, I didn't add or remove anything. This is my first patch so I didn't want to mess too much with what was there before, even if the comments sometimes seemed superfluous to me.
No problem, everyone's first patch is rejected. Just fix it up in line with the review comments and resend.
regards,
dan carpenter
Greg KH
maintainerQuoted 12 lines · Pol Eyschen
Quoted 9 lines · Dan Carpenter
Quoted 8 lines · Mark Einon
Quoted 6 lines · Pol Eyschen
From: Pol Eyschen <[email protected]>
All comments fixed to match the kernel coding style.
Signed-off-by Pol Eyschen <[email protected]>---
Quoted 8 lines
Quoted 4 lines
Quoted 4 lines
This patch doesn't apply to my staging-next branch. Are you making your changes to the staging-next branch of
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git?I cloned
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.gitand made my changes to that branch.
That is Linus's tree, not "linux-next" which we all develop against.
thanks,
greg k-h
Greg KH
maintainerQuoted 14 lines · Pol Eyschen
From: Pol Eyschen <[email protected]>
All comments fixed to match the kernel coding style.
Signed-off-by Pol Eyschen <[email protected]>--- drivers/staging/ced1401/ced_ioc.c | 382 ++++++++++++++++++++++++------------- 1 file changed, 249 insertions(+), 133 deletions(-)drivers/staging/ced1401/ced_ioc.c +0
-0
drivers/staging/ced1401/ced_ioc.c static void FlushOutBuff(DEVICE_EXTENSION *pdx) · line 46
Quoted 7 lines
drivers/staging/ced1401/ced_ioc.c +2
-1@@ -41,7 +41,8 @@ static void FlushOutBuff(DEVICE_EXTENSION *pdx) {dev_dbg (&pdx->interface->dev,"%s currentState=%d" , __func__, pdx->sCurrentState); -if (pdx->sCurrentState ==U14ERR_TIME )/* Do nothing if hardware in trouble */ +if (pdx->sCurrentState ==U14ERR_TIME ) +/* Do nothing if hardware in trouble */ return ;
Please wrap stuff like this in { } to not confuse people.
thanks,
greg k-h
Quoted 1 line · Greg KH
On Mon, Jan 13, 2014 at 08:41:40PM +0100, Pol Eyschen wrote:
[]
Quoted 1 line
drivers/staging/ced1401/ced_ioc.c
Quoted 1 line
drivers/staging/ced1401/ced_ioc.c +0
-0
[]
Quoted 10 lines
drivers/staging/ced1401/ced_ioc.c static void FlushOutBuff(DEVICE_EXTENSION *pdx) · line 46
Quoted 8 lines
drivers/staging/ced1401/ced_ioc.c +2
-1@@ -41,7 +41,8 @@ static void FlushOutBuff(DEVICE_EXTENSION *pdx) {dev_dbg (&pdx->interface->dev,"%s currentState=%d" , __func__, pdx->sCurrentState); -if (pdx->sCurrentState ==U14ERR_TIME )/* Do nothing if hardware in trouble */ +if (pdx->sCurrentState ==U14ERR_TIME ) +/* Do nothing if hardware in trouble */ return ;Please wrap stuff like this in { } to not confuse people.
Yes please, or maybe put the comment on the return line like:
if (pdx->sCurrentState == U14ERR_TIME) return; /* Do nothing if hardware in trouble */
or above the test like:
/* Do nothing if hardware in trouble */ if (pdx->sCurrentState == U14ERR_TIME) return;
PATCH 1/1 staging: ced1401: Fix dev_<level> messages
Add a missing newline to each message.
Standardize style to "%s: ...", __func__.
---
There are a _lot_ of function tracing style
uses of dev_dbg that could/should be deleted.
This patch doesn't attempt to delete them.
drivers/staging/ced1401/ced_ioc.c | 151 +++++++++++++++--------------- drivers/staging/ced1401/usb1401.c | 188 +++++++++++++++++++------------------- 2 files changed, 171 insertions(+), 168 deletions(-)
drivers/staging/ced1401/ced_ioc.c +76 -75
@@ -38,8 +38,8 @@****************************************************************************/ static void FlushOutBuff (DEVICE_EXTENSION *pdx) { -dev_dbg (&pdx->interface->dev,"%s currentState=%d" , __func__, - pdx->sCurrentState); +dev_dbg (&pdx->interface->dev,"%s: currentState=%d\n" , + __func__, pdx->sCurrentState);if (pdx->sCurrentState ==U14ERR_TIME )/* Do nothing if hardware in trouble */ return ;/* Kill off any pending I/O */
@@ -59,8 +59,8 @@ static void FlushOutBuff(DEVICE_EXTENSION *pdx)****************************************************************************/ static void FlushInBuff (DEVICE_EXTENSION *pdx) { -dev_dbg (&pdx->interface->dev,"%s currentState=%d" , __func__, - pdx->sCurrentState); +dev_dbg (&pdx->interface->dev,"%s: currentState=%d\n" , + __func__, pdx->sCurrentState);if (pdx->sCurrentState ==U14ERR_TIME )/* Do nothing if hardware in trouble */ return ;/* Kill off any pending I/O */
@@ -118,8 +118,8 @@ int SendString(DEVICE_EXTENSION *pdx, const char __user *pData,mutex_lock (&pdx->io_mutex);/* Protect disconnect from new i/o */ if (n >0 ) {/* do nothing if nowt to do! */ -dev_dbg (&pdx->interface->dev,"%s n=%d>%s<" , __func__, n, - buffer); +dev_dbg (&pdx->interface->dev,"%s: n=%d>%s<\n" , + __func__, n, buffer); iReturn =PutChars (pdx, buffer, n); }
@@ -139,7 +139,7 @@ int SendChar(DEVICE_EXTENSION *pdx, char c)int iReturn;mutex_lock (&pdx->io_mutex);/* Protect disconnect from new i/o */ iReturn =PutChars (pdx, &c,1 ); -dev_dbg (&pdx->interface->dev,"SendChar >%c< (0x%02x)" , c, c); +dev_dbg (&pdx->interface->dev,"SendChar >%c< (0x%02x)\n" , c, c);Allowi (pdx);/* Make sure char reads are running */ mutex_unlock (&pdx->io_mutex);return iReturn;
@@ -174,7 +174,7 @@ int SendChar(DEVICE_EXTENSION *pdx, char c)int Get1401State (DEVICE_EXTENSION *pdx,__u32 *state,__u32 *error) {int nGot; -dev_dbg (&pdx->interface->dev,"Get1401State() entry" ); +dev_dbg (&pdx->interface->dev,"%s: entry\n" , __func__); *state =0xFFFFFFFF ;/* Start off with invalid state */ nGot = usb_control_msg(pdx->udev, usb_rcvctrlpipe(pdx->udev, 0),
@@ -182,15 +182,15 @@ int Get1401State(DEVICE_EXTENSION *pdx, __u32 *state, __u32 *error) pdx->statBuf, sizeof(pdx->statBuf), HZ);if (nGot !=sizeof (pdx->statBuf)) {dev_err (&pdx->interface->dev, -"Get1401State() FAILED, return code %d" , nGot); +"%s: FAILED, return code %d\n" , __func__, nGot); pdx->sCurrentState =U14ERR_TIME ;/* Indicate that things are very wrong indeed */ *state =0 ;/* Force status values to a known state */ *error =0 ; }else {int nDevice;dev_dbg (&pdx->interface->dev, -"Get1401State() Success, state: 0x%x, 0x%x" , - pdx->statBuf[0 ], pdx->statBuf[1 ]); +"%s: Success, state: 0x%x, 0x%x\n" , + __func__, pdx->statBuf[0 ], pdx->statBuf[1 ]); *state = pdx->statBuf[0 ];/* Return the state values to the calling code */ *error = pdx->statBuf[1 ];
@@ -220,8 +220,8 @@ int Get1401State(DEVICE_EXTENSION *pdx, __u32 *state, __u32 *error)****************************************************************************/ int ReadWrite_Cancel (DEVICE_EXTENSION *pdx) { -dev_dbg (&pdx->interface->dev,"ReadWrite_Cancel entry %d" , - pdx->bStagedUrbPending); +dev_dbg (&pdx->interface->dev,"%s: entry %d\n" , + __func__, pdx->bStagedUrbPending);#ifdef NOT_WRITTEN_YET int ntStatus =STATUS_SUCCESS ;bool bResult = false;
@@ -231,7 +231,7 @@ int ReadWrite_Cancel(DEVICE_EXTENSION *pdx)if (pdx->bStagedUrbPending) {/* anything to be cancelled? May need more... */ dev_info (&pdx->interface - dev, -"ReadWrite_Cancel about to cancel Urb" ); +"ReadWrite_Cancel about to cancel Urb\n" );/* Clear the staging done flag */ /* KeClearEvent(&pdx->StagingDoneEvent); */ USB_ASSERT (pdx->pStagedIrp !=NULL );
@@ -244,14 +244,14 @@ int ReadWrite_Cancel(DEVICE_EXTENSION *pdx)LARGE_INTEGER timeout; timeout.QuadPart =-10000000 ;/* Use a timeout of 1 second */ dev_info (&pdx->interface - dev, -"ReadWrite_Cancel about to wait till done" ); +"%s: about to wait till done\n" , __func__); ntStatus =KeWaitForSingleObject (&pdx->StagingDoneEvent, Executive, KernelMode, FALSE, &timeout); }else {dev_info (&pdx->interface - dev, -"ReadWrite_Cancel, cancellation failed" ); +"%s: cancellation failed\n" , __func__); ntStatus =U14ERR_FAIL ; } USB_KdPrint(DBGLVL_DEFAULT,
@@ -260,7 +260,7 @@ int ReadWrite_Cancel(DEVICE_EXTENSION *pdx) } elsespin_unlock_irq (&pdx->stagedLock); -dev_info (&pdx->interface - dev,"ReadWrite_Cancel done" ); +dev_info (&pdx->interface - dev,"%s: done\n" , __func__);return ntStatus;#else return U14ERR_NOERROR ;
@@ -304,7 +304,7 @@ static int InSelfTest(DEVICE_EXTENSION *pdx, unsigned int *pState)bool Is1401 (DEVICE_EXTENSION *pdx) {int iReturn; -dev_dbg (&pdx->interface->dev,"%s" , __func__); +dev_dbg (&pdx->interface->dev,"%s\n" , __func__);ced_draw_down (pdx);/* wait for, then kill outstanding Urbs */ FlushInBuff (pdx);/* Clear out input buffer & pipe */
@@ -368,7 +368,7 @@ bool QuickCheck(DEVICE_EXTENSION *pdx, bool bTestBuff, bool bCanReset) (pdx->sCurrentState >= U14ERR_STD)); /* No 1401 errors stored */dev_dbg (&pdx->interface->dev, -"%s DMAFlag:%d, state:%d, force:%d, testBuff:%d, short:%d" , +"%s: DMAFlag:%d, state:%d, force:%d, testBuff:%d, short:%d\n" , __func__, pdx->dwDMAFlag, pdx->sCurrentState, pdx->bForceReset, bTestBuff, bShortTest);
@@ -376,13 +376,13 @@ bool QuickCheck(DEVICE_EXTENSION *pdx, bool bTestBuff, bool bCanReset) (pdx->dwNumInput || pdx->dwNumOutput)) { /* ...characters were in the buffer? */ bShortTest = false;/* Then do the full test */ dev_dbg (&pdx->interface->dev, -"%s will reset as buffers not empty" , __func__); +"%s: will reset as buffers not empty\n" , __func__); }if (bShortTest || !bCanReset) {/* Still OK to try the short test? */ /* Always test if no reset - we want state update */ unsigned int state, error; -dev_dbg (&pdx->interface->dev,"%s->Get1401State" , __func__); +dev_dbg (&pdx->interface->dev,"%s: Get1401State\n" , __func__);if (Get1401State (pdx, &state, &error) ==U14ERR_NOERROR ) {/* Check on the 1401 state */ if ((state &0xFF ) ==0 )/* If call worked, check the status value */ bRet = true;/* If that was zero, all is OK, no reset needed */
@@ -390,7 +390,7 @@ bool QuickCheck(DEVICE_EXTENSION *pdx, bool bTestBuff, bool bCanReset) }if (!bRet && bCanReset) {/* If all not OK, then */ -dev_info (&pdx->interface->dev,"%s->Is1401 %d %d %d %d" , +dev_info (&pdx->interface->dev,"%s: Is1401 %d %d %d %d\n" , __func__, bShortTest, pdx->sCurrentState, bTestBuff, pdx->bForceReset); bRet =Is1401 (pdx);/* do full test */
@@ -407,7 +407,8 @@ bool QuickCheck(DEVICE_EXTENSION *pdx, bool bTestBuff, bool bCanReset)int Reset1401 (DEVICE_EXTENSION *pdx) {mutex_lock (&pdx->io_mutex);/* Protect disconnect from new i/o */ -dev_dbg (&pdx->interface->dev,"ABout to call QuickCheck" ); +dev_dbg (&pdx->interface->dev,"%s: About to call QuickCheck\n" , + __func__);QuickCheck (pdx, true, true);/* Check 1401, reset if not OK */ mutex_unlock (&pdx->io_mutex);return U14ERR_NOERROR ;
@@ -423,7 +424,7 @@ int GetChar(DEVICE_EXTENSION *pdx)int iReturn =U14ERR_NOIN ;/* assume we will get nothing */ mutex_lock (&pdx->io_mutex);/* Protect disconnect from new i/o */ -dev_dbg (&pdx->interface->dev,"GetChar" ); +dev_dbg (&pdx->interface->dev,"%s\n" , __func__);Allowi (pdx);/* Make sure char reads are running */ SendChars (pdx);/* and send any buffered chars */
@@ -497,8 +498,8 @@ int GetString(DEVICE_EXTENSION *pdx, char __user *pUser, int n) pdx->dwNumInput -= nGot;spin_unlock_irq (&pdx->charInLock); -dev_dbg (&pdx->interface->dev, -"GetString read %d characters >%s<" , nGot, buffer); +dev_dbg (&pdx->interface->dev,"%s: read %d characters >%s<\n" , + __func__, nGot, buffer);if (copy_to_user (pUser, buffer, nCopyToUser)) iReturn = -EFAULT ;else
@@ -555,7 +556,7 @@ int LineCount(DEVICE_EXTENSION *pdx) }spin_unlock_irq (&pdx->charInLock); -dev_dbg (&pdx->interface->dev,"LineCount returned %d" , iReturn); +dev_dbg (&pdx->interface->dev,"%s: returned %d\n" , __func__, iReturn);mutex_unlock (&pdx->io_mutex);/* Protect disconnect from new i/o */ return iReturn; }
@@ -571,7 +572,7 @@ int GetOutBufSpace(DEVICE_EXTENSION *pdx)mutex_lock (&pdx->io_mutex);/* Protect disconnect from new i/o */ SendChars (pdx);/* send any buffered chars */ iReturn = (int )(OUTBUF_SZ - pdx->dwNumOutput);/* no lock needed for single read */ -dev_dbg (&pdx->interface->dev,"OutBufSpace %d" , iReturn); +dev_dbg (&pdx->interface->dev,"%s: %d\n" , __func__, iReturn);mutex_unlock (&pdx->io_mutex);/* Protect disconnect from new i/o */ return iReturn; }
@@ -589,7 +590,7 @@ int ClearArea(DEVICE_EXTENSION *pdx, int nArea)if ((nArea <0 ) || (nArea >=MAX_TRANSAREAS )) { iReturn =U14ERR_BADAREA ; -dev_err (&pdx->interface->dev,"%s Attempt to clear area %d" , +dev_err (&pdx->interface->dev,"%s: Attempt to clear area %d\n" , __func__, nArea); }else {TRANSAREA *pTA = &pdx->rTransDef[nArea];/* to save typing */
@@ -602,14 +603,14 @@ int ClearArea(DEVICE_EXTENSION *pdx, int nArea)int nPages =0 ;/* and number of pages */ int np; -dev_dbg (&pdx->interface->dev,"%s area %d" , __func__, - nArea); +dev_dbg (&pdx->interface->dev,"%s: area %d\n" , + __func__, nArea);spin_lock_irq (&pdx->stagedLock);if ((pdx->StagedId == nArea) && (pdx->dwDMAFlag >MODE_CHAR )) { iReturn =U14ERR_UNLOCKFAIL ;/* cannot delete as in use */ dev_err (&pdx->interface->dev, -"%s call on area %d while active" , +"%s: call on area %d while active\n" , __func__, nArea); }else { pPages = pTA->pPages;/* save page address list */
@@ -633,7 +634,7 @@ int ClearArea(DEVICE_EXTENSION *pdx, int nArea)/* Now we must undo the pinning down of the pages. We will assume the worst and mark */ /* all the pages as dirty. Don't be tempted to move this up above as you must not be */ /* holding a spin lock to do this stuff as it is not atomic. */ -dev_dbg (&pdx->interface->dev,"%s nPages=%d" , +dev_dbg (&pdx->interface->dev,"%s: nPages=%d\n" , __func__, nPages);for (np =0 ; np < nPages; ++np) {
@@ -645,7 +646,7 @@ int ClearArea(DEVICE_EXTENSION *pdx, int nArea)kfree (pPages);dev_dbg (&pdx->interface->dev, -"%s kfree(pPages) done" , __func__); +"%s: kfree(pPages) done\n" , __func__); } } }
@@ -687,12 +688,12 @@ static int SetArea(DEVICE_EXTENSION *pdx, int nArea, char __user *puBuf, iReturn =U14ERR_NOMEMORY ; goto error; } -dev_dbg (&pdx->interface->dev,"%s %p, length=%06x, circular %d" , +dev_dbg (&pdx->interface->dev,"%s: %p, length=%06x, circular %d\n" , __func__, puBuf, dwLength, bCircular);/* To pin down user pages we must first acquire the mapping semaphore. */ nPages =get_user_pages_fast (ulStart, len,1 , pPages); -dev_dbg (&pdx->interface->dev,"%s nPages = %d" , __func__, nPages); +dev_dbg (&pdx->interface->dev,"%s: nPages = %d\n" , __func__, nPages);if (nPages >0 ) {/* if we succeeded */ /* If you are tempted to use page_address (form LDD3), forget it. You MUST use */
@@ -744,8 +745,8 @@ int SetTransfer(DEVICE_EXTENSION *pdx, TRANSFERDESC __user *pTD)return -EFAULT ;mutex_lock (&pdx->io_mutex); -dev_dbg (&pdx->interface->dev,"%s area:%d, size:%08x" , __func__, - td.wAreaNum, td.dwLength); +dev_dbg (&pdx->interface->dev,"%s: area:%d, size:%08x\n" , + __func__, td.wAreaNum, td.dwLength);/* The strange cast is done so that we don't get warnings in 32-bit linux about the size of the */ /* pointer. The pointer is always passed as a 64-bit object so that we don't have problems using */ /* a 32-bit program on a 64-bit system. unsigned long is 64-bits on a 64-bit system. */
@@ -922,7 +923,7 @@ int GetTransfer(DEVICE_EXTENSION *pdx, TGET_TX_BLOCK __user *pTX)****************************************************************************/ int KillIO1401 (DEVICE_EXTENSION *pdx) { -dev_dbg (&pdx->interface->dev,"%s" , __func__); +dev_dbg (&pdx->interface->dev,"%s\n" , __func__);mutex_lock (&pdx->io_mutex);FlushOutBuff (pdx);FlushInBuff (pdx);
@@ -938,7 +939,7 @@ int KillIO1401(DEVICE_EXTENSION *pdx)int BlkTransState (DEVICE_EXTENSION *pdx) {int iReturn = pdx->dwDMAFlag !=MODE_CHAR ; -dev_dbg (&pdx->interface->dev,"%s = %d" , __func__, iReturn); +dev_dbg (&pdx->interface->dev,"%s: %d\n" , __func__, iReturn);return iReturn; }
@@ -956,7 +957,7 @@ int StateOf1401(DEVICE_EXTENSION *pdx) iReturn = pdx->sCurrentState;mutex_unlock (&pdx->io_mutex); -dev_dbg (&pdx->interface->dev,"%s = %d" , __func__, iReturn); +dev_dbg (&pdx->interface->dev,"%s: %d\n" , __func__, iReturn);return iReturn; }
@@ -971,7 +972,7 @@ int StartSelfTest(DEVICE_EXTENSION *pdx) {int nGot;mutex_lock (&pdx->io_mutex); -dev_dbg (&pdx->interface->dev,"%s" , __func__); +dev_dbg (&pdx->interface->dev,"%s\n" , __func__);ced_draw_down (pdx);/* wait for, then kill outstanding Urbs */ FlushInBuff (pdx);/* Clear out input buffer & pipe */
@@ -987,7 +988,7 @@ int StartSelfTest(DEVICE_EXTENSION *pdx)mutex_unlock (&pdx->io_mutex);if (nGot <0 ) -dev_err (&pdx->interface->dev,"%s err=%d" , __func__, nGot); +dev_err (&pdx->interface->dev,"%s: err=%d\n" , __func__, nGot);return nGot <0 ?U14ERR_FAIL :U14ERR_NOERROR ; }
@@ -1005,7 +1006,7 @@ int CheckSelfTest(DEVICE_EXTENSION *pdx, TGET_SELFTEST __user *pGST)mutex_lock (&pdx->io_mutex); -dev_dbg (&pdx->interface->dev,"%s" , __func__); +dev_dbg (&pdx->interface->dev,"%s\n" , __func__); iReturn =Get1401State (pdx, &state, &error);if (iReturn ==U14ERR_NOERROR )/* Only accept zero if it happens twice */ iReturn =Get1401State (pdx, &state, &error);
@@ -1013,8 +1014,8 @@ int CheckSelfTest(DEVICE_EXTENSION *pdx, TGET_SELFTEST __user *pGST)if (iReturn !=U14ERR_NOERROR ) {/* Self-test can cause comms errors */ /* so we assume still testing */ dev_err (&pdx->interface->dev, -"%s Get1401State=%d, assuming still testing" , __func__, - iReturn); +"%s: Get1401State=%d, assuming still testing\n" , + __func__, iReturn); state =0x80 ;/* Force still-testing, no error */ error =0 ; iReturn =U14ERR_NOERROR ;
@@ -1022,7 +1023,7 @@ int CheckSelfTest(DEVICE_EXTENSION *pdx, TGET_SELFTEST __user *pGST)if ((state ==-1 ) && (error ==-1 )) {/* If Get1401State had problems */ dev_err (&pdx->interface->dev, -"%s Get1401State failed, assuming still testing" , +"%s: Get1401State failed, assuming still testing\n" , __func__); state =0x80 ;/* Force still-testing, no error */ error =0 ;
@@ -1033,21 +1034,21 @@ int CheckSelfTest(DEVICE_EXTENSION *pdx, TGET_SELFTEST __user *pGST) gst.code = (state &0x00FF0000 ) >>16 ;/* read the error code */ gst.x = error &0x0000FFFF ;/* Error data X */ gst.y = (error &0xFFFF0000 ) >>16 ;/* and data Y */ -dev_dbg (&pdx->interface->dev,"Self-test error code %d" , - gst.code); +dev_dbg (&pdx->interface->dev, +"Self-test error code %d\n" , gst.code); }else {/* No error, check for timeout */ unsigned long ulNow = jiffies;/* get current time */ if (time_after (ulNow, pdx->ulSelfTestTime)) { gst.code =-2 ;/* Flag the timeout */ dev_dbg (&pdx->interface->dev, -"Self-test timed-out" ); +"Self-test timed-out\n" ); }else dev_dbg (&pdx->interface->dev, -"Self-test on-going" ); +"Self-test on-going\n" ); } }else { gst.code =-1 ;/* Flag the test is done */ -dev_dbg (&pdx->interface->dev,"Self-test done" ); +dev_dbg (&pdx->interface->dev,"Self-test done\n" ); }if (gst.code <0 ) {/* If we have a problem or finished */
@@ -1074,7 +1075,7 @@ int TypeOf1401(DEVICE_EXTENSION *pdx) {int iReturn =TYPEUNKNOWN ;mutex_lock (&pdx->io_mutex); -dev_dbg (&pdx->interface->dev,"%s" , __func__); +dev_dbg (&pdx->interface->dev,"%s\n" , __func__);switch (pdx->s1401Type) {case TYPE1401 :
@@ -1092,7 +1093,7 @@ int TypeOf1401(DEVICE_EXTENSION *pdx) else /* for up-coming 1401 designs */ iReturn =TYPEUNKNOWN ;/* Don't know or not there */ } -dev_dbg (&pdx->interface->dev,"%s %d" , __func__, iReturn); +dev_dbg (&pdx->interface->dev,"%s %d\n" , __func__, iReturn);mutex_unlock (&pdx->io_mutex);return iReturn;
@@ -1107,7 +1108,7 @@ int TransferFlags(DEVICE_EXTENSION *pdx) {int iReturn =U14TF_MULTIA |U14TF_DIAG |/* we always have multiple DMA area */ U14TF_NOTIFY |U14TF_CIRCTH ;/* diagnostics, notify and circular */ -dev_dbg (&pdx->interface->dev,"%s" , __func__); +dev_dbg (&pdx->interface->dev,"%s\n" , __func__);mutex_lock (&pdx->io_mutex);if (pdx->bIsUSB2)/* Set flag for USB2 if appropriate */ iReturn |=U14TF_USB2 ;
@@ -1125,15 +1126,15 @@ static int DbgCmd1401(DEVICE_EXTENSION *pdx, unsigned char cmd, unsigned int data) {int iReturn; -dev_dbg (&pdx->interface->dev,"%s entry" , __func__); +dev_dbg (&pdx->interface->dev,"%s: entry\n" , __func__); iReturn =usb_control_msg (pdx->udev,usb_sndctrlpipe (pdx->udev,0 ), cmd, (H_TO_D |VENDOR |DEVREQ ), (unsigned short )data, (unsigned short )(data >>16 ),NULL ,0 ,HZ );/* allow 1 second timeout */ if (iReturn <0 ) -dev_err (&pdx->interface->dev,"%s fail code=%d" , __func__, - iReturn); +dev_err (&pdx->interface->dev,"%s: fail code=%d\n" , + __func__, iReturn);return iReturn; }
@@ -1152,7 +1153,7 @@ int DbgPeek(DEVICE_EXTENSION *pdx, TDBGBLOCK __user *pDB)return -EFAULT ;mutex_lock (&pdx->io_mutex); -dev_dbg (&pdx->interface->dev,"%s @ %08x" , __func__, db.iAddr); +dev_dbg (&pdx->interface->dev,"%s: @ %08x\n" , __func__, db.iAddr); iReturn =DbgCmd1401 (pdx,DB_SETADD , db.iAddr);if (iReturn ==U14ERR_NOERROR )
@@ -1181,7 +1182,7 @@ int DbgPoke(DEVICE_EXTENSION *pdx, TDBGBLOCK __user *pDB)return -EFAULT ;mutex_lock (&pdx->io_mutex); -dev_dbg (&pdx->interface->dev,"%s @ %08x" , __func__, db.iAddr); +dev_dbg (&pdx->interface->dev,"%s: @ %08x\n" , __func__, db.iAddr); iReturn =DbgCmd1401 (pdx,DB_SETADD , db.iAddr);if (iReturn ==U14ERR_NOERROR )
@@ -1210,7 +1211,7 @@ int DbgRampData(DEVICE_EXTENSION *pdx, TDBGBLOCK __user *pDB)return -EFAULT ;mutex_lock (&pdx->io_mutex); -dev_dbg (&pdx->interface->dev,"%s @ %08x" , __func__, db.iAddr); +dev_dbg (&pdx->interface->dev,"%s: @ %08x\n" , __func__, db.iAddr); iReturn =DbgCmd1401 (pdx,DB_SETADD , db.iAddr);if (iReturn ==U14ERR_NOERROR )
@@ -1242,7 +1243,7 @@ int DbgRampAddr(DEVICE_EXTENSION *pdx, TDBGBLOCK __user *pDB)return -EFAULT ;mutex_lock (&pdx->io_mutex); -dev_dbg (&pdx->interface->dev,"%s" , __func__); +dev_dbg (&pdx->interface->dev,"%s\n" , __func__); iReturn =DbgCmd1401 (pdx,DB_SETDEF , db.iDefault);if (iReturn ==U14ERR_NOERROR )
@@ -1270,7 +1271,7 @@ int DbgGetData(DEVICE_EXTENSION *pdx, TDBGBLOCK __user *pDB)memset (&db,0 ,sizeof (db));/* fill returned block with 0s */ mutex_lock (&pdx->io_mutex); -dev_dbg (&pdx->interface->dev,"%s" , __func__); +dev_dbg (&pdx->interface->dev,"%s\n" , __func__);/* Read back the last peeked value from the 1401. */ iReturn = usb_control_msg(pdx->udev, usb_rcvctrlpipe(pdx->udev, 0),
@@ -1282,8 +1283,8 @@ int DbgGetData(DEVICE_EXTENSION *pdx, TDBGBLOCK __user *pDB)else iReturn =U14ERR_NOERROR ; }else -dev_err (&pdx->interface->dev,"%s failed, code %d" , __func__, - iReturn); +dev_err (&pdx->interface->dev,"%s: failed, code %d\n" , + __func__, iReturn);mutex_unlock (&pdx->io_mutex);
@@ -1302,7 +1303,7 @@ int DbgStopLoop(DEVICE_EXTENSION *pdx)unsigned int uState, uErr;mutex_lock (&pdx->io_mutex); -dev_dbg (&pdx->interface->dev,"%s" , __func__); +dev_dbg (&pdx->interface->dev,"%s\n" , __func__); iReturn =Get1401State (pdx, &uState, &uErr);mutex_unlock (&pdx->io_mutex);
@@ -1327,8 +1328,8 @@ int SetCircular(DEVICE_EXTENSION *pdx, TRANSFERDESC __user *pTD)return -EFAULT ;mutex_lock (&pdx->io_mutex); -dev_dbg (&pdx->interface->dev,"%s area:%d, size:%08x" , __func__, - td.wAreaNum, td.dwLength); +dev_dbg (&pdx->interface->dev,"%s: area:%d, size:%08x\n" , + __func__, td.wAreaNum, td.dwLength); bToHost = td.eSize !=0 ;/* this is used as the tohost flag */ /* The strange cast is done so that we don't get warnings in 32-bit linux about the size of the */
@@ -1353,7 +1354,7 @@ int GetCircBlock(DEVICE_EXTENSION *pdx, TCIRCBLOCK __user *pCB)unsigned int nArea;TCIRCBLOCK cb; -dev_dbg (&pdx->interface->dev,"%s" , __func__); +dev_dbg (&pdx->interface->dev,"%s\n" , __func__);if (copy_from_user (&cb, pCB,sizeof (cb)))return -EFAULT ;
@@ -1374,7 +1375,7 @@ int GetCircBlock(DEVICE_EXTENSION *pdx, TCIRCBLOCK __user *pCB) cb.dwOffset = pArea->aBlocks[0 ].dwOffset; cb.dwSize = pArea->aBlocks[0 ].dwSize;dev_dbg (&pdx->interface->dev, -"%s return block 0: %d bytes at %d" , +"%s: return block 0: %d bytes at %d\n" , __func__, cb.dwSize, cb.dwOffset); } }else
@@ -1402,7 +1403,7 @@ int FreeCircBlock(DEVICE_EXTENSION *pdx, TCIRCBLOCK __user *pCB)unsigned int nArea, uStart, uSize;TCIRCBLOCK cb; -dev_dbg (&pdx->interface->dev,"%s" , __func__); +dev_dbg (&pdx->interface->dev,"%s\n" , __func__);if (copy_from_user (&cb, pCB,sizeof (cb)))return -EFAULT ;
@@ -1437,7 +1438,7 @@ int FreeCircBlock(DEVICE_EXTENSION *pdx, TCIRCBLOCK __user *pCB) } dev_dbg(&pdx->interface->dev, - "%s free %d bytes at %d, return %d bytes at %d, wait=%d", + "%s: free %d bytes at %d, return %d bytes at %d, wait=%d\n", __func__, uSize, uStart, pArea->aBlocks[0].dwSize, pArea->aBlocks[0].dwOffset,
@@ -1453,13 +1454,13 @@ int FreeCircBlock(DEVICE_EXTENSION *pdx, TCIRCBLOCK __user *pCB) bWaiting = pdx->bXFerWaiting;if (bWaiting && pdx->bStagedUrbPending) {dev_err (&pdx->interface->dev, -"%s ERROR: waiting xfer and staged Urb pending!" , +"%s: ERROR: waiting xfer and staged Urb pending!\n" , __func__); bWaiting = false; } }else {dev_err (&pdx->interface->dev, -"%s ERROR: freeing %d bytes at %d, block 0 is %d bytes at %d" , +"%s: ERROR: freeing %d bytes at %d, block 0 is %d bytes at %d\n" , __func__, uSize, uStart, pArea->aBlocks[0 ].dwSize, pArea->aBlocks[0 ].dwOffset);
@@ -1475,7 +1476,7 @@ int FreeCircBlock(DEVICE_EXTENSION *pdx, TCIRCBLOCK __user *pCB) pdx->rDMAInfo.dwSize);if (RWMStat !=U14ERR_NOERROR )dev_err (&pdx->interface->dev, -"%s rw setup failed %d" , +"%s: rw setup failed %d\n" , __func__, RWMStat); } }else
drivers/staging/ced1401/usb1401.c +95 -93
623 lines not on this page · raw message