diff options
| author | Luca Ellero <luca.ellero@brickedbrain.com> | 2014-07-10 11:03:59 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-10 15:10:05 -0700 |
| commit | b1b9286e29851128504cfb5be8c526706f979fab (patch) | |
| tree | 437a6a0e78d9752f008a31e25da92345ac64d052 /drivers/staging/ced1401 | |
| parent | 4a376719cec0709eba0ed819eba2df0ce88ea113 (diff) | |
| download | op-kernel-dev-b1b9286e29851128504cfb5be8c526706f979fab.zip op-kernel-dev-b1b9286e29851128504cfb5be8c526706f979fab.tar.gz | |
staging: ced1401: fix ced_get_transfer()
Rename camel case arguments and locals in function ced_get_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 | 18 | ||||
| -rw-r--r-- | drivers/staging/ced1401/usb1401.h | 2 |
2 files changed, 11 insertions, 9 deletions
diff --git a/drivers/staging/ced1401/ced_ioc.c b/drivers/staging/ced1401/ced_ioc.c index 47ef5dd..80bc213 100644 --- a/drivers/staging/ced1401/ced_ioc.c +++ b/drivers/staging/ced1401/ced_ioc.c @@ -939,17 +939,18 @@ int ced_test_event(struct ced_data *ced, int area) ** ced_get_transferInfo ** Puts the current state of the 1401 in a TGET_TX_BLOCK. *****************************************************************************/ -int ced_get_transfer(struct ced_data *ced, TGET_TX_BLOCK __user *pTX) +int ced_get_transfer(struct ced_data *ced, TGET_TX_BLOCK __user *utx) { - int iReturn = U14ERR_NOERROR; + int ret = U14ERR_NOERROR; unsigned int dwIdent; mutex_lock(&ced->io_mutex); dwIdent = ced->staged_id; /* area ident for last xfer */ if (dwIdent >= MAX_TRANSAREAS) - iReturn = U14ERR_BADAREA; + ret = U14ERR_BADAREA; else { - /* Return the best information we have - we don't have physical addresses */ + /* Return the best information we have - we */ + /* don't have physical addresses */ TGET_TX_BLOCK *tx; tx = kzalloc(sizeof(*tx), GFP_KERNEL); @@ -959,18 +960,19 @@ int ced_get_transfer(struct ced_data *ced, TGET_TX_BLOCK __user *pTX) } tx->size = ced->trans_def[dwIdent].length; tx->linear = (long long)((long)ced->trans_def[dwIdent].buff); - tx->avail = GET_TX_MAXENTRIES; /* how many blocks we could return */ + /* how many blocks we could return */ + tx->avail = GET_TX_MAXENTRIES; tx->used = 1; /* number we actually return */ tx->entries[0].physical = (long long)(tx->linear + ced->staged_offset); tx->entries[0].size = tx->size; - if (copy_to_user(pTX, tx, sizeof(*tx))) - iReturn = -EFAULT; + if (copy_to_user(utx, tx, sizeof(*tx))) + ret = -EFAULT; kfree(tx); } mutex_unlock(&ced->io_mutex); - return iReturn; + return ret; } /**************************************************************************** diff --git a/drivers/staging/ced1401/usb1401.h b/drivers/staging/ced1401/usb1401.h index 30dbe5b..c5a4118 100644 --- a/drivers/staging/ced1401/usb1401.h +++ b/drivers/staging/ced1401/usb1401.h @@ -237,7 +237,7 @@ extern int ced_set_event(struct ced_data *ced, extern int ced_stat_1401(struct ced_data *ced); extern int ced_line_count(struct ced_data *ced); extern int ced_get_out_buf_space(struct ced_data *ced); -extern int ced_get_transfer(struct ced_data *ced, TGET_TX_BLOCK __user *pGTB); +extern int ced_get_transfer(struct ced_data *ced, TGET_TX_BLOCK __user *utx); extern int ced_kill_io(struct ced_data *ced); extern int ced_state_of_1401(struct ced_data *ced); extern int ced_start_self_test(struct ced_data *ced); |
