diff options
| author | Luca Ellero <luca.ellero@brickedbrain.com> | 2014-07-10 11:03:54 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-10 15:10:05 -0700 |
| commit | 2932f3aed1da8bb00b16050b9c1fa8a9f14e34fc (patch) | |
| tree | 5c81a6e2acec56c7098373b14db2b04d5a46ba0f /drivers/staging/ced1401 | |
| parent | 0c68a74d4b7d09edd6ee2b525bc0205b72e8b96d (diff) | |
staging: ced1401: fix ced_set_transfer()
Rename camel case arguments and locals in function ced_set_transfer()
Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/ced1401')
| -rw-r--r-- | drivers/staging/ced1401/ced_ioc.c | 19 | ||||
| -rw-r--r-- | drivers/staging/ced1401/usb1401.h | 3 |
2 files changed, 13 insertions, 9 deletions
diff --git a/drivers/staging/ced1401/ced_ioc.c b/drivers/staging/ced1401/ced_ioc.c index 4609cb4b3017..bba034cce7d8 100644 --- a/drivers/staging/ced1401/ced_ioc.c +++ b/drivers/staging/ced1401/ced_ioc.c @@ -775,26 +775,29 @@ error: ** 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 ced_set_transfer(struct ced_data *ced, struct transfer_area_desc __user *pTD) +int ced_set_transfer(struct ced_data *ced, + struct transfer_area_desc __user *utd) { - int iReturn; + int ret; struct transfer_area_desc td; - if (copy_from_user(&td, pTD, sizeof(td))) + if (copy_from_user(&td, utd, sizeof(td))) return -EFAULT; mutex_lock(&ced->io_mutex); dev_dbg(&ced->interface->dev, "%s: area:%d, size:%08x\n", __func__, td.wAreaNum, td.dwLength); - /* The strange cast is done so that we don't get warnings in 32-bit linux about the size of the */ - /* pointer. The pointer is always passed as a 64-bit object so that we don't have problems using */ - /* a 32-bit program on a 64-bit system. unsigned long is 64-bits on a 64-bit system. */ - iReturn = + /* The strange cast is done so that we don't get warnings in 32-bit */ + /* linux about the size of the pointer. The pointer is always passed */ + /* as a 64-bit object so that we don't have problems using a 32-bit */ + /* program on a 64-bit system. unsigned long is 64-bits on a 64-bit */ + /* system. */ + ret = ced_set_area(ced, td.wAreaNum, (char __user *)((unsigned long)td.lpvBuff), td.dwLength, false, false); mutex_unlock(&ced->io_mutex); - return iReturn; + return ret; } /**************************************************************************** diff --git a/drivers/staging/ced1401/usb1401.h b/drivers/staging/ced1401/usb1401.h index a5fc387c3820..c8cb2c545288 100644 --- a/drivers/staging/ced1401/usb1401.h +++ b/drivers/staging/ced1401/usb1401.h @@ -229,7 +229,8 @@ extern int ced_read_write_cancel(struct ced_data *ced); extern int ced_reset(struct ced_data *ced); extern int ced_get_char(struct ced_data *ced); extern int ced_get_string(struct ced_data *ced, char __user *user, int n); -extern int ced_set_transfer(struct ced_data *ced, struct transfer_area_desc __user *pTD); +extern int ced_set_transfer(struct ced_data *ced, + struct transfer_area_desc __user *utd); extern int ced_unset_transfer(struct ced_data *ced, int nArea); extern int ced_set_event(struct ced_data *ced, struct transfer_event __user *pTE); extern int ced_stat_1401(struct ced_data *ced); |