From: Luca Ellero Date: Mon, 30 Jun 2014 09:57:55 +0000 (+0200) Subject: staging: ced1401: rename SendString() X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=747ce5829ec58447321dff9ceef68a3f67e24c4f;p=deliverable%2Flinux.git staging: ced1401: rename SendString() rename camel case function SendString() to ced_send_string() 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 be0350b44a0c..b71b2bcafe1e 100644 --- a/drivers/staging/ced1401/ced_ioc.c +++ b/drivers/staging/ced1401/ced_ioc.c @@ -105,7 +105,7 @@ static int ced_put_chars(DEVICE_EXTENSION *pdx, const char *pCh, ** trigger an output transfer if this is appropriate. User mode. ** Holds the io_mutex *****************************************************************************/ -int SendString(DEVICE_EXTENSION *pdx, const char __user *pData, +int ced_send_string(DEVICE_EXTENSION *pdx, const char __user *pData, unsigned int n) { int iReturn = U14ERR_NOERROR; /* assume all will be well */ diff --git a/drivers/staging/ced1401/usb1401.c b/drivers/staging/ced1401/usb1401.c index e94668176be3..6d2c836f4321 100644 --- a/drivers/staging/ced1401/usb1401.c +++ b/drivers/staging/ced1401/usb1401.c @@ -1229,7 +1229,7 @@ static long ced_ioctl(struct file *file, unsigned int cmd, unsigned long ulArg) switch (_IOC_NR(cmd)) { case _IOC_NR(IOCTL_CED_SENDSTRING(0)): - return SendString(pdx, (const char __user *)ulArg, + return ced_send_string(pdx, (const char __user *)ulArg, _IOC_SIZE(cmd)); case _IOC_NR(IOCTL_CED_RESET1401): diff --git a/drivers/staging/ced1401/usb1401.h b/drivers/staging/ced1401/usb1401.h index a8d74da0422d..969b93297120 100644 --- a/drivers/staging/ced1401/usb1401.h +++ b/drivers/staging/ced1401/usb1401.h @@ -209,7 +209,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 SendString(DEVICE_EXTENSION *pdx, const char __user *pData, unsigned int n); +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 Get1401State(DEVICE_EXTENSION *pdx, __u32 *state, __u32 *error); extern int ReadWrite_Cancel(DEVICE_EXTENSION *pdx);