ced1401 coding style fixes
PATCH 1/1 ced1401 coding style fixes
Signed-off-by Jinqiang Zeng <[email protected]>
--- drivers/staging/ced1401/usb1401.c | 8 ++++++-- drivers/staging/ced1401/use14_ioc.h | 4 ---- 2 files changed, 6 insertions(+), 6 deletions(-)
drivers/staging/ced1401/usb1401.c +6 -2
@@ -896,7 +896,7 @@ static bool ReadWord(unsigned short *pWord, char *pBuf, unsigned int *pdDone,** to indicate three byte total. ** *****************************************************************************/ -static bool ReadHuff (volatile unsigned int *pDWord,char *pBuf, +static bool ReadHuff (unsigned int *pDWord,char *pBuf,unsigned int *pdDone,unsigned int dGot) {unsigned char ucData;/* for each read to ReadChar */
@@ -941,7 +941,7 @@ static bool ReadHuff(volatile unsigned int *pDWord, char *pBuf,** we start handling the data at offset zero. ** *****************************************************************************/ -static bool ReadDMAInfo (volatile DMADESC *pDmaDesc,DEVICE_EXTENSION *pdx, +static bool ReadDMAInfo (DMADESC *pDmaDesc,DEVICE_EXTENSION *pdx,char *pBuf,unsigned int dwCount) {bool bResult = false;/* assume we won't succeed */
@@ -1122,6 +1122,7 @@ static void ced_readchar_callback(struct urb *pUrb)spin_lock (&pdx->charInLock);/* already at irq level */ if (nGot >0 ) {unsigned int i; +if (nGot <INBUF_SZ ) { pdx->pCoherCharIn[nGot] =0 ;/* tidy the string */ dev_dbg(&pdx->interface->dev,
@@ -1514,6 +1515,7 @@ static void ced_disconnect(struct usb_interface *interface)void ced_draw_down (DEVICE_EXTENSION *pdx) {int time; +dev_dbg (&pdx->interface->dev,"%s: called\n" , __func__); pdx->bInDrawDown = true;
@@ -1548,6 +1550,7 @@ static int ced_resume(struct usb_interface *intf)static int ced_pre_reset (struct usb_interface *intf) {DEVICE_EXTENSION *pdx =usb_get_intfdata (intf); +dev_dbg (&pdx->interface->dev,"%s\n" , __func__);mutex_lock (&pdx->io_mutex);ced_draw_down (pdx);
@@ -1557,6 +1560,7 @@ static int ced_pre_reset(struct usb_interface *intf)static int ced_post_reset (struct usb_interface *intf) {DEVICE_EXTENSION *pdx =usb_get_intfdata (intf); +dev_dbg (&pdx->interface->dev,"%s\n" , __func__);/* we are sure no URBs are active - no locking needed */
drivers/staging/ced1401/use14_ioc.h +0 -4
@@ -267,15 +267,11 @@ typedef union /* to communicate with 1401 driver status & control funcs */T1401REGISTERS registers; }TCSBLOCK ; -typedef TCSBLOCK *LPTCSBLOCK ; -typedef struct paramBlk {short sState;TCSBLOCK csBlock; }PARAMBLK ; -typedef PARAMBLK *PPARAMBLK ; -struct transfer_area_desc /* Structure and type for SetTransArea */ {unsigned short wArea;/* number of transfer area to set up */
Signature · 1 line
1.7.7.6
The subject is in the wrong format. It should be:
[PATCH 1/3] Staging: ced1401: fix long lines
[PATCH 2/3] Staging: ced1401: add blank lines after declarations [PATCH 3/3] Staging: ced1401: remove unused typedefs
Btw, break it up into 3 patches.
regards,
dan carpenter