From: Luca Ellero Date: Mon, 30 Jun 2014 10:00:30 +0000 (+0200) Subject: staging: ced1401: rename StateOf1401() X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=21d46fc4ed241fd17f61210e46d79daad9494680;p=deliverable%2Flinux.git staging: ced1401: rename StateOf1401() rename camel case function StateOf1401() to ced_state_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 f05cef5c6204..cd16bd5548a9 100644 --- a/drivers/staging/ced1401/ced_ioc.c +++ b/drivers/staging/ced1401/ced_ioc.c @@ -932,11 +932,11 @@ int ced_kill_io(DEVICE_EXTENSION *pdx) } /**************************************************************************** -** StateOf1401 +** ced_state_of_1401 ** ** Puts the current state of the 1401 in the Irp return buffer. *****************************************************************************/ -int StateOf1401(DEVICE_EXTENSION *pdx) +int ced_state_of_1401(DEVICE_EXTENSION *pdx) { int iReturn; mutex_lock(&pdx->io_mutex); diff --git a/drivers/staging/ced1401/usb1401.c b/drivers/staging/ced1401/usb1401.c index b83f8e11791a..ede5e6afaafd 100644 --- a/drivers/staging/ced1401/usb1401.c +++ b/drivers/staging/ced1401/usb1401.c @@ -1275,7 +1275,7 @@ static long ced_ioctl(struct file *file, unsigned int cmd, unsigned long ulArg) return ced_kill_io(pdx); case _IOC_NR(IOCTL_CED_STATEOF1401): - return StateOf1401(pdx); + return ced_state_of_1401(pdx); case _IOC_NR(IOCTL_CED_GRAB1401): case _IOC_NR(IOCTL_CED_FREE1401): diff --git a/drivers/staging/ced1401/usb1401.h b/drivers/staging/ced1401/usb1401.h index d75a81303d82..c15302d8234b 100644 --- a/drivers/staging/ced1401/usb1401.h +++ b/drivers/staging/ced1401/usb1401.h @@ -224,7 +224,7 @@ extern int ced_line_count(DEVICE_EXTENSION *pdx); extern int ced_get_out_buf_space(DEVICE_EXTENSION *pdx); extern int ced_get_transfer(DEVICE_EXTENSION *pdx, TGET_TX_BLOCK __user *pGTB); extern int ced_kill_io(DEVICE_EXTENSION *pdx); -extern int StateOf1401(DEVICE_EXTENSION *pdx); +extern int ced_state_of_1401(DEVICE_EXTENSION *pdx); extern int StartSelfTest(DEVICE_EXTENSION *pdx); extern int CheckSelfTest(DEVICE_EXTENSION *pdx, TGET_SELFTEST __user *pGST); extern int TypeOf1401(DEVICE_EXTENSION *pdx);