diff options
| author |   Luca Ellero <luca.ellero@brickedbrain.com> | 2014-06-30 11:58:12 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-08 15:58:13 -0700 |
| commit | 617bfec33c6cdef1f9ddb67beed059f11cb2a089 (patch) | |
| tree | 4e30cd02c2daeefa6435e7cd50f0a8278787ca90 | |
| parent | staging: ced1401: rename UnsetTransfer() (diff) | |
staging: ced1401: rename SetEvent()
rename camel case function SetEvent() to ced_set_event()
Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/ced1401/ced_ioc.c | 4 | ||||
| -rw-r--r-- | drivers/staging/ced1401/usb1401.c | 2 | ||||
| -rw-r--r-- | 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 124fffa22bab..6210dde70e11 100644 --- a/drivers/staging/ced1401/ced_ioc.c +++ b/drivers/staging/ced1401/ced_ioc.c @@ -772,14 +772,14 @@ int ced_unset_transfer(DEVICE_EXTENSION *pdx, int nArea) } /**************************************************************************** -** SetEvent +** ced_set_event ** Creates an event that we can test for based on a transfer to/from an area. ** The area must be setup for a transfer. We attempt to simulate the Windows ** driver behavior for events (as we don't actually use them), which is to ** pretend that whatever the user asked for was achieved, so we return 1 if ** try to create one, and 0 if they ask to remove (assuming all else was OK). ****************************************************************************/ -int SetEvent(DEVICE_EXTENSION *pdx, struct transfer_event __user *pTE) +int ced_set_event(DEVICE_EXTENSION *pdx, struct transfer_event __user *pTE) { int iReturn = U14ERR_NOERROR; struct transfer_event te; diff --git a/drivers/staging/ced1401/usb1401.c b/drivers/staging/ced1401/usb1401.c index 3e7c0c1a54f5..c9b01bef4515 100644 --- a/drivers/staging/ced1401/usb1401.c +++ b/drivers/staging/ced1401/usb1401.c @@ -1257,7 +1257,7 @@ static long ced_ioctl(struct file *file, unsigned int cmd, unsigned long ulArg) return ced_unset_transfer(pdx, (int)ulArg); case _IOC_NR(IOCTL_CED_SETEVENT): - return SetEvent(pdx, (struct transfer_event __user *) ulArg); + return ced_set_event(pdx, (struct transfer_event __user *) ulArg); case _IOC_NR(IOCTL_CED_GETOUTBUFSPACE): return ced_get_out_buf_space(pdx); diff --git a/drivers/staging/ced1401/usb1401.h b/drivers/staging/ced1401/usb1401.h index ff2526100672..a1968a8088df 100644 --- a/drivers/staging/ced1401/usb1401.h +++ b/drivers/staging/ced1401/usb1401.h @@ -218,7 +218,7 @@ 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 ced_unset_transfer(DEVICE_EXTENSION *pdx, int nArea); -extern int SetEvent(DEVICE_EXTENSION *pdx, struct transfer_event __user *pTE); +extern int ced_set_event(DEVICE_EXTENSION *pdx, struct transfer_event __user *pTE); 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); |