From 3c469dfdc2625cc9d047db43f0d406749242f97f Mon Sep 17 00:00:00 2001 From: Luca Ellero Date: Mon, 30 Jun 2014 11:57:42 +0200 Subject: [PATCH] staging: ced1401: rename SendChars() rename camel case function SendChars() to ced_send_chars() Signed-off-by: Luca Ellero Signed-off-by: Greg Kroah-Hartman --- drivers/staging/ced1401/ced_ioc.c | 12 ++++++------ drivers/staging/ced1401/usb1401.c | 4 ++-- drivers/staging/ced1401/usb1401.h | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/staging/ced1401/ced_ioc.c b/drivers/staging/ced1401/ced_ioc.c index ebbc5090f219..ed62dbf66084 100644 --- a/drivers/staging/ced1401/ced_ioc.c +++ b/drivers/staging/ced1401/ced_ioc.c @@ -92,7 +92,7 @@ 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 */ + iReturn = ced_send_chars(pdx); /* ...give a chance to transmit data */ } else { iReturn = U14ERR_NOOUT; /* no room at the out (ha-ha) */ spin_unlock_irq(&pdx->charOutLock); @@ -427,7 +427,7 @@ int GetChar(DEVICE_EXTENSION *pdx) dev_dbg(&pdx->interface->dev, "%s\n", __func__); Allowi(pdx); /* Make sure char reads are running */ - SendChars(pdx); /* and send any buffered chars */ + ced_send_chars(pdx); /* and send any buffered chars */ spin_lock_irq(&pdx->charInLock); if (pdx->dwNumInput > 0) { /* worth looking */ @@ -465,7 +465,7 @@ int GetString(DEVICE_EXTENSION *pdx, char __user *pUser, int n) mutex_lock(&pdx->io_mutex); /* Protect disconnect from new i/o */ Allowi(pdx); /* Make sure char reads are running */ - SendChars(pdx); /* and send any buffered chars */ + ced_send_chars(pdx); /* and send any buffered chars */ spin_lock_irq(&pdx->charInLock); nAvailable = pdx->dwNumInput; /* characters available now */ @@ -521,7 +521,7 @@ int Stat1401(DEVICE_EXTENSION *pdx) int iReturn; mutex_lock(&pdx->io_mutex); /* Protect disconnect from new i/o */ Allowi(pdx); /* make sure we allow pending chars */ - SendChars(pdx); /* in both directions */ + ced_send_chars(pdx); /* in both directions */ iReturn = pdx->dwNumInput; /* no lock as single read */ mutex_unlock(&pdx->io_mutex); /* Protect disconnect from new i/o */ return iReturn; @@ -540,7 +540,7 @@ int LineCount(DEVICE_EXTENSION *pdx) mutex_lock(&pdx->io_mutex); /* Protect disconnect from new i/o */ Allowi(pdx); /* Make sure char reads are running */ - SendChars(pdx); /* and send any buffered chars */ + ced_send_chars(pdx); /* and send any buffered chars */ spin_lock_irq(&pdx->charInLock); /* Get protection */ if (pdx->dwNumInput > 0) { /* worth looking? */ @@ -570,7 +570,7 @@ int GetOutBufSpace(DEVICE_EXTENSION *pdx) { int iReturn; mutex_lock(&pdx->io_mutex); /* Protect disconnect from new i/o */ - SendChars(pdx); /* send any buffered chars */ + ced_send_chars(pdx); /* send any buffered chars */ iReturn = (int)(OUTBUF_SZ - pdx->dwNumOutput); /* no lock needed for single read */ dev_dbg(&pdx->interface->dev, "%s: %d\n", __func__, iReturn); mutex_unlock(&pdx->io_mutex); /* Protect disconnect from new i/o */ diff --git a/drivers/staging/ced1401/usb1401.c b/drivers/staging/ced1401/usb1401.c index dc985a0e6f8f..2ad3560a3128 100644 --- a/drivers/staging/ced1401/usb1401.c +++ b/drivers/staging/ced1401/usb1401.c @@ -333,11 +333,11 @@ static void ced_writechar_callback(struct urb *pUrb) } /**************************************************************************** -** SendChars +** ced_send_chars ** Transmit the characters in the output buffer to the 1401. This may need ** breaking down into multiple transfers. ****************************************************************************/ -int SendChars(DEVICE_EXTENSION *pdx) +int ced_send_chars(DEVICE_EXTENSION *pdx) { int iReturn = U14ERR_NOERROR; diff --git a/drivers/staging/ced1401/usb1401.h b/drivers/staging/ced1401/usb1401.h index 8327e9ce93c3..67901b86aa38 100644 --- a/drivers/staging/ced1401/usb1401.h +++ b/drivers/staging/ced1401/usb1401.h @@ -202,7 +202,7 @@ typedef struct _DEVICE_EXTENSION { /* Definitions of routimes used between compilation object files */ /* in usb1401.c */ extern int Allowi(DEVICE_EXTENSION *pdx); -extern int SendChars(DEVICE_EXTENSION *pdx); +extern int ced_send_chars(DEVICE_EXTENSION *pdx); extern void ced_draw_down(DEVICE_EXTENSION *pdx); extern int ReadWriteMem(DEVICE_EXTENSION *pdx, bool Read, unsigned short wIdent, unsigned int dwOffs, unsigned int dwLen); -- 2.11.0