From: Luca Ellero Date: Mon, 30 Jun 2014 10:00:33 +0000 (+0200) Subject: staging: ced1401: rename TypeOf1401() X-Git-Tag: firefly_0821_release~176^2~3491^2~1198 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9056249f275914207ccafa46c7688e3749f499cf;p=firefly-linux-kernel-4.4.55.git staging: ced1401: rename TypeOf1401() rename camel case function TypeOf1401() to ced_type_of_1401() 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 1cc75bf55643..6b31c9f33030 100644 --- a/drivers/staging/ced1401/ced_ioc.c +++ b/drivers/staging/ced1401/ced_ioc.c @@ -1055,11 +1055,11 @@ int ced_check_self_test(DEVICE_EXTENSION *pdx, TGET_SELFTEST __user *pGST) } /**************************************************************************** -** TypeOf1401 +** ced_type_of_1401 ** ** Returns code for standard, plus, micro1401, power1401 or none ****************************************************************************/ -int TypeOf1401(DEVICE_EXTENSION *pdx) +int ced_type_of_1401(DEVICE_EXTENSION *pdx) { int iReturn = TYPEUNKNOWN; mutex_lock(&pdx->io_mutex); diff --git a/drivers/staging/ced1401/usb1401.c b/drivers/staging/ced1401/usb1401.c index 3f82875f491e..f3577b91d823 100644 --- a/drivers/staging/ced1401/usb1401.c +++ b/drivers/staging/ced1401/usb1401.c @@ -1288,7 +1288,7 @@ static long ced_ioctl(struct file *file, unsigned int cmd, unsigned long ulArg) return ced_check_self_test(pdx, (TGET_SELFTEST __user *) ulArg); case _IOC_NR(IOCTL_CED_TYPEOF1401): - return TypeOf1401(pdx); + return ced_type_of_1401(pdx); case _IOC_NR(IOCTL_CED_TRANSFERFLAGS): return TransferFlags(pdx); diff --git a/drivers/staging/ced1401/usb1401.h b/drivers/staging/ced1401/usb1401.h index 0c7ad233a7c5..19d7296a18a9 100644 --- a/drivers/staging/ced1401/usb1401.h +++ b/drivers/staging/ced1401/usb1401.h @@ -227,7 +227,7 @@ extern int ced_kill_io(DEVICE_EXTENSION *pdx); extern int ced_state_of_1401(DEVICE_EXTENSION *pdx); extern int ced_start_self_test(DEVICE_EXTENSION *pdx); extern int ced_check_self_test(DEVICE_EXTENSION *pdx, TGET_SELFTEST __user *pGST); -extern int TypeOf1401(DEVICE_EXTENSION *pdx); +extern int ced_type_of_1401(DEVICE_EXTENSION *pdx); extern int TransferFlags(DEVICE_EXTENSION *pdx); extern int DbgPeek(DEVICE_EXTENSION *pdx, TDBGBLOCK __user *pDB); extern int DbgPoke(DEVICE_EXTENSION *pdx, TDBGBLOCK __user *pDB);