From: Luca Ellero Date: Mon, 30 Jun 2014 09:57:56 +0000 (+0200) Subject: staging: ced1401: rename SendChar() X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1a0f2ccdebefae6c149b815be05e4baf5bbe54ff;p=linux-beck.git staging: ced1401: rename SendChar() rename camel case function SendChar() to ced_send_char() Signed-off-by: Luca Ellero Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/ced1401/ced_ioc.c b/drivers/staging/ced1401/ced_ioc.c index b71b2bcafe1e..eb74ade725d8 100644 --- a/drivers/staging/ced1401/ced_ioc.c +++ b/drivers/staging/ced1401/ced_ioc.c @@ -130,16 +130,16 @@ int ced_send_string(DEVICE_EXTENSION *pdx, const char __user *pData, } /**************************************************************************** -** SendChar +** ced_send_char ** ** Sends a single character to the 1401. User mode, holds io_mutex. ****************************************************************************/ -int SendChar(DEVICE_EXTENSION *pdx, char c) +int ced_send_char(DEVICE_EXTENSION *pdx, char c) { int iReturn; mutex_lock(&pdx->io_mutex); /* Protect disconnect from new i/o */ iReturn = ced_put_chars(pdx, &c, 1); - dev_dbg(&pdx->interface->dev, "SendChar >%c< (0x%02x)\n", c, c); + dev_dbg(&pdx->interface->dev, "ced_send_char >%c< (0x%02x)\n", c, c); ced_allowi(pdx); /* Make sure char reads are running */ mutex_unlock(&pdx->io_mutex); return iReturn; diff --git a/drivers/staging/ced1401/usb1401.c b/drivers/staging/ced1401/usb1401.c index 6d2c836f4321..b7e4255a3ab7 100644 --- a/drivers/staging/ced1401/usb1401.c +++ b/drivers/staging/ced1401/usb1401.c @@ -1239,7 +1239,7 @@ static long ced_ioctl(struct file *file, unsigned int cmd, unsigned long ulArg) return GetChar(pdx); case _IOC_NR(IOCTL_CED_SENDCHAR): - return SendChar(pdx, (char)ulArg); + return ced_send_char(pdx, (char)ulArg); case _IOC_NR(IOCTL_CED_STAT1401): return Stat1401(pdx); diff --git a/drivers/staging/ced1401/usb1401.h b/drivers/staging/ced1401/usb1401.h index 969b93297120..8c8ecfd604a1 100644 --- a/drivers/staging/ced1401/usb1401.h +++ b/drivers/staging/ced1401/usb1401.h @@ -210,7 +210,7 @@ extern int ced_read_write_mem(DEVICE_EXTENSION *pdx, bool Read, unsigned short w /* in ced_ioc.c */ extern int ClearArea(DEVICE_EXTENSION *pdx, int nArea); extern int ced_send_string(DEVICE_EXTENSION *pdx, const char __user *pData, unsigned int n); -extern int SendChar(DEVICE_EXTENSION *pdx, char c); +extern int ced_send_char(DEVICE_EXTENSION *pdx, char c); extern int Get1401State(DEVICE_EXTENSION *pdx, __u32 *state, __u32 *error); extern int ReadWrite_Cancel(DEVICE_EXTENSION *pdx); extern bool Is1401(DEVICE_EXTENSION *pdx);