From 3d012b01a84d9de6eb1ba4db13911047ba171950 Mon Sep 17 00:00:00 2001 From: Luca Ellero Date: Mon, 30 Jun 2014 11:58:15 +0200 Subject: [PATCH] staging: ced1401: rename GetTransfer() rename camel case function GetTransfer() to ced_get_transfer() Signed-off-by: Luca Ellero Signed-off-by: Greg Kroah-Hartman --- drivers/staging/ced1401/ced_ioc.c | 4 ++-- drivers/staging/ced1401/usb1401.c | 2 +- drivers/staging/ced1401/usb1401.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/ced1401/ced_ioc.c b/drivers/staging/ced1401/ced_ioc.c index f868a65292ca..2901552f1329 100644 --- a/drivers/staging/ced1401/ced_ioc.c +++ b/drivers/staging/ced1401/ced_ioc.c @@ -879,10 +879,10 @@ int ced_test_event(DEVICE_EXTENSION *pdx, int nArea) } /**************************************************************************** -** GetTransferInfo +** ced_get_transferInfo ** Puts the current state of the 1401 in a TGET_TX_BLOCK. *****************************************************************************/ -int GetTransfer(DEVICE_EXTENSION *pdx, TGET_TX_BLOCK __user *pTX) +int ced_get_transfer(DEVICE_EXTENSION *pdx, TGET_TX_BLOCK __user *pTX) { int iReturn = U14ERR_NOERROR; unsigned int dwIdent; diff --git a/drivers/staging/ced1401/usb1401.c b/drivers/staging/ced1401/usb1401.c index 25f4a47744b6..2e4b20100edf 100644 --- a/drivers/staging/ced1401/usb1401.c +++ b/drivers/staging/ced1401/usb1401.c @@ -1269,7 +1269,7 @@ static long ced_ioctl(struct file *file, unsigned int cmd, unsigned long ulArg) return (2 << 24) | (DRIVERMAJREV << 16) | DRIVERMINREV; /* USB | MAJOR | MINOR */ case _IOC_NR(IOCTL_CED_GETTRANSFER): - return GetTransfer(pdx, (TGET_TX_BLOCK __user *) ulArg); + return ced_get_transfer(pdx, (TGET_TX_BLOCK __user *) ulArg); case _IOC_NR(IOCTL_CED_KILLIO1401): return KillIO1401(pdx); diff --git a/drivers/staging/ced1401/usb1401.h b/drivers/staging/ced1401/usb1401.h index 11ffb5921a92..85f5ec6a1db7 100644 --- a/drivers/staging/ced1401/usb1401.h +++ b/drivers/staging/ced1401/usb1401.h @@ -222,7 +222,7 @@ extern int ced_set_event(DEVICE_EXTENSION *pdx, struct transfer_event __user *pT extern int ced_stat_1401(DEVICE_EXTENSION *pdx); extern int ced_line_count(DEVICE_EXTENSION *pdx); extern int ced_get_out_buf_space(DEVICE_EXTENSION *pdx); -extern int GetTransfer(DEVICE_EXTENSION *pdx, TGET_TX_BLOCK __user *pGTB); +extern int ced_get_transfer(DEVICE_EXTENSION *pdx, TGET_TX_BLOCK __user *pGTB); extern int KillIO1401(DEVICE_EXTENSION *pdx); extern int BlkTransState(DEVICE_EXTENSION *pdx); extern int StateOf1401(DEVICE_EXTENSION *pdx); -- 2.39.5