From: Luca Ellero Date: Mon, 30 Jun 2014 09:58:10 +0000 (+0200) Subject: staging: ced1401: rename SetTransfer() X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=991037533f1de5953339e7c100aa4419772e14f9;p=deliverable%2Flinux.git staging: ced1401: rename SetTransfer() rename camel case function SetTransfer() to ced_set_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 287b2553cd3a..ec08069ced66 100644 --- a/drivers/staging/ced1401/ced_ioc.c +++ b/drivers/staging/ced1401/ced_ioc.c @@ -658,7 +658,7 @@ int ced_clear_area(DEVICE_EXTENSION *pdx, int nArea) ** ced_set_area ** ** Sets up a transfer area - the functional part. Called by both -** SetTransfer and SetCircular. +** ced_set_transfer and SetCircular. ****************************************************************************/ static int ced_set_area(DEVICE_EXTENSION *pdx, int nArea, char __user *puBuf, unsigned int dwLength, bool bCircular, bool bCircToHost) @@ -730,13 +730,13 @@ error: } /**************************************************************************** -** SetTransfer +** ced_set_transfer ** ** Sets up a transfer area record. If the area is already set, we attempt to ** unset it. Unsetting will fail if the area is booked, and a transfer to that ** area is in progress. Otherwise, we will release the area and re-assign it. ****************************************************************************/ -int SetTransfer(DEVICE_EXTENSION *pdx, struct transfer_area_desc __user *pTD) +int ced_set_transfer(DEVICE_EXTENSION *pdx, struct transfer_area_desc __user *pTD) { int iReturn; struct transfer_area_desc td; diff --git a/drivers/staging/ced1401/usb1401.c b/drivers/staging/ced1401/usb1401.c index f277aecfbc80..4f71330f0851 100644 --- a/drivers/staging/ced1401/usb1401.c +++ b/drivers/staging/ced1401/usb1401.c @@ -1251,7 +1251,7 @@ static long ced_ioctl(struct file *file, unsigned int cmd, unsigned long ulArg) return ced_get_string(pdx, (char __user *)ulArg, _IOC_SIZE(cmd)); case _IOC_NR(IOCTL_CED_SETTRANSFER): - return SetTransfer(pdx, (struct transfer_area_desc __user *) ulArg); + return ced_set_transfer(pdx, (struct transfer_area_desc __user *) ulArg); case _IOC_NR(IOCTL_CED_UNSETTRANSFER): return UnsetTransfer(pdx, (int)ulArg); diff --git a/drivers/staging/ced1401/usb1401.h b/drivers/staging/ced1401/usb1401.h index 2a9b6632ca91..707074857786 100644 --- a/drivers/staging/ced1401/usb1401.h +++ b/drivers/staging/ced1401/usb1401.h @@ -216,7 +216,7 @@ extern int ced_read_write_cancel(DEVICE_EXTENSION *pdx); 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 SetTransfer(DEVICE_EXTENSION *pdx, struct transfer_area_desc __user *pTD); +extern int ced_set_transfer(DEVICE_EXTENSION *pdx, struct transfer_area_desc __user *pTD); extern int UnsetTransfer(DEVICE_EXTENSION *pdx, int nArea); extern int SetEvent(DEVICE_EXTENSION *pdx, struct transfer_event __user *pTE); extern int ced_stat_1401(DEVICE_EXTENSION *pdx);