From: Luca Ellero Date: Mon, 30 Jun 2014 09:58:06 +0000 (+0200) Subject: staging: ced1401: rename LineCount() X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5dc137dd0920e54ab343e6d4b2c591977a86fe5b;p=linux-beck.git staging: ced1401: rename LineCount() rename camel case function LineCount() to ced_line_count() 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 306213668b53..09a5b7375f81 100644 --- a/drivers/staging/ced1401/ced_ioc.c +++ b/drivers/staging/ced1401/ced_ioc.c @@ -528,13 +528,13 @@ int ced_stat_1401(DEVICE_EXTENSION *pdx) } /**************************************************************************** -** LineCount +** ced_line_count ** ** Returns the number of newline chars in the buffer. There is no need for ** any fancy interlocks as we only read the interrupt routine data, and the ** system is arranged so nothing can be destroyed. ****************************************************************************/ -int LineCount(DEVICE_EXTENSION *pdx) +int ced_line_count(DEVICE_EXTENSION *pdx) { int iReturn = 0; /* will be count of line ends */ diff --git a/drivers/staging/ced1401/usb1401.c b/drivers/staging/ced1401/usb1401.c index bcb0ce0c6a9b..4cf8b1346586 100644 --- a/drivers/staging/ced1401/usb1401.c +++ b/drivers/staging/ced1401/usb1401.c @@ -1245,7 +1245,7 @@ static long ced_ioctl(struct file *file, unsigned int cmd, unsigned long ulArg) return ced_stat_1401(pdx); case _IOC_NR(IOCTL_CED_LINECOUNT): - return LineCount(pdx); + return ced_line_count(pdx); case _IOC_NR(IOCTL_CED_GETSTRING(0)): return ced_get_string(pdx, (char __user *)ulArg, _IOC_SIZE(cmd)); diff --git a/drivers/staging/ced1401/usb1401.h b/drivers/staging/ced1401/usb1401.h index 707290f68953..86c8233a2625 100644 --- a/drivers/staging/ced1401/usb1401.h +++ b/drivers/staging/ced1401/usb1401.h @@ -220,7 +220,7 @@ extern int SetTransfer(DEVICE_EXTENSION *pdx, struct transfer_area_desc __user * extern int UnsetTransfer(DEVICE_EXTENSION *pdx, int nArea); extern int SetEvent(DEVICE_EXTENSION *pdx, struct transfer_event __user *pTE); extern int ced_stat_1401(DEVICE_EXTENSION *pdx); -extern int LineCount(DEVICE_EXTENSION *pdx); +extern int ced_line_count(DEVICE_EXTENSION *pdx); extern int GetOutBufSpace(DEVICE_EXTENSION *pdx); extern int GetTransfer(DEVICE_EXTENSION *pdx, TGET_TX_BLOCK __user *pGTB); extern int KillIO1401(DEVICE_EXTENSION *pdx);