From: Luca Ellero Date: Mon, 30 Jun 2014 09:58:11 +0000 (+0200) Subject: staging: ced1401: rename UnsetTransfer() X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=0f6f679a15989f857f0ac1e42c35b237364d6969;p=deliverable%2Flinux.git staging: ced1401: rename UnsetTransfer() rename camel case function UnsetTransfer() to ced_unset_transfer() 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 ec08069ced66..124fffa22bab 100644 --- a/drivers/staging/ced1401/ced_ioc.c +++ b/drivers/staging/ced1401/ced_ioc.c @@ -762,7 +762,7 @@ int ced_set_transfer(DEVICE_EXTENSION *pdx, struct transfer_area_desc __user *pT ** UnSetTransfer ** Erases a transfer area record ****************************************************************************/ -int UnsetTransfer(DEVICE_EXTENSION *pdx, int nArea) +int ced_unset_transfer(DEVICE_EXTENSION *pdx, int nArea) { int iReturn; mutex_lock(&pdx->io_mutex); diff --git a/drivers/staging/ced1401/usb1401.c b/drivers/staging/ced1401/usb1401.c index 4f71330f0851..3e7c0c1a54f5 100644 --- a/drivers/staging/ced1401/usb1401.c +++ b/drivers/staging/ced1401/usb1401.c @@ -1254,7 +1254,7 @@ static long ced_ioctl(struct file *file, unsigned int cmd, unsigned long ulArg) return ced_set_transfer(pdx, (struct transfer_area_desc __user *) ulArg); case _IOC_NR(IOCTL_CED_UNSETTRANSFER): - return UnsetTransfer(pdx, (int)ulArg); + return ced_unset_transfer(pdx, (int)ulArg); case _IOC_NR(IOCTL_CED_SETEVENT): return SetEvent(pdx, (struct transfer_event __user *) ulArg); diff --git a/drivers/staging/ced1401/usb1401.h b/drivers/staging/ced1401/usb1401.h index 707074857786..ff2526100672 100644 --- a/drivers/staging/ced1401/usb1401.h +++ b/drivers/staging/ced1401/usb1401.h @@ -217,7 +217,7 @@ extern int ced_reset(DEVICE_EXTENSION *pdx); extern int ced_get_char(DEVICE_EXTENSION *pdx); extern int ced_get_string(DEVICE_EXTENSION *pdx, char __user *pUser, int n); extern int ced_set_transfer(DEVICE_EXTENSION *pdx, struct transfer_area_desc __user *pTD); -extern int UnsetTransfer(DEVICE_EXTENSION *pdx, int nArea); +extern int ced_unset_transfer(DEVICE_EXTENSION *pdx, int nArea); extern int SetEvent(DEVICE_EXTENSION *pdx, struct transfer_event __user *pTE); extern int ced_stat_1401(DEVICE_EXTENSION *pdx); extern int ced_line_count(DEVICE_EXTENSION *pdx);