From: Luca Ellero Date: Mon, 30 Jun 2014 09:58:03 +0000 (+0200) Subject: staging: ced1401: rename Reset1401() X-Git-Tag: firefly_0821_release~176^2~3491^2~1216 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0e218f17172861cedb7637274bc7586447f21df7;p=firefly-linux-kernel-4.4.55.git staging: ced1401: rename Reset1401() rename camel case function Reset1401() to ced_reset() 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 02085fa58da3..112cc13dd3f2 100644 --- a/drivers/staging/ced1401/ced_ioc.c +++ b/drivers/staging/ced1401/ced_ioc.c @@ -400,11 +400,11 @@ static bool ced_quick_check(DEVICE_EXTENSION *pdx, bool bTestBuff, bool bCanRese } /**************************************************************************** -** Reset1401 +** ced_reset ** ** Resets the 1401 and empties the i/o buffers *****************************************************************************/ -int Reset1401(DEVICE_EXTENSION *pdx) +int ced_reset(DEVICE_EXTENSION *pdx) { mutex_lock(&pdx->io_mutex); /* Protect disconnect from new i/o */ dev_dbg(&pdx->interface->dev, "%s: About to call ced_quick_check\n", diff --git a/drivers/staging/ced1401/usb1401.c b/drivers/staging/ced1401/usb1401.c index b7e4255a3ab7..f8507b5725cf 100644 --- a/drivers/staging/ced1401/usb1401.c +++ b/drivers/staging/ced1401/usb1401.c @@ -1233,7 +1233,7 @@ static long ced_ioctl(struct file *file, unsigned int cmd, unsigned long ulArg) _IOC_SIZE(cmd)); case _IOC_NR(IOCTL_CED_RESET1401): - return Reset1401(pdx); + return ced_reset(pdx); case _IOC_NR(IOCTL_CED_GETCHAR): return GetChar(pdx); diff --git a/drivers/staging/ced1401/usb1401.h b/drivers/staging/ced1401/usb1401.h index 23c755795925..26c76f2b088f 100644 --- a/drivers/staging/ced1401/usb1401.h +++ b/drivers/staging/ced1401/usb1401.h @@ -213,7 +213,7 @@ extern int ced_send_string(DEVICE_EXTENSION *pdx, const char __user *pData, unsi extern int ced_send_char(DEVICE_EXTENSION *pdx, char c); extern int ced_get_state(DEVICE_EXTENSION *pdx, __u32 *state, __u32 *error); extern int ced_read_write_cancel(DEVICE_EXTENSION *pdx); -extern int Reset1401(DEVICE_EXTENSION *pdx); +extern int ced_reset(DEVICE_EXTENSION *pdx); extern int GetChar(DEVICE_EXTENSION *pdx); extern int GetString(DEVICE_EXTENSION *pdx, char __user *pUser, int n); extern int SetTransfer(DEVICE_EXTENSION *pdx, struct transfer_area_desc __user *pTD);