diff options
author | Rene Sapiens | 2010-07-10 04:23:55 +0200 |
---|---|---|
committer | Greg Kroah-Hartman | 2010-07-22 19:45:34 +0200 |
commit | b301c85803376ef997bd7802cd5f0e3e88d10ae8 (patch) | |
tree | e6da9fe16047546c1e96c06f9296a45a6ea4e28e /drivers/staging/tidspbridge/core/chnl_sm.c | |
parent | staging: ti dspbridge: fix compilation error (diff) | |
download | kernel-qcow2-linux-b301c85803376ef997bd7802cd5f0e3e88d10ae8.tar.gz kernel-qcow2-linux-b301c85803376ef997bd7802cd5f0e3e88d10ae8.tar.xz kernel-qcow2-linux-b301c85803376ef997bd7802cd5f0e3e88d10ae8.zip |
staging: ti dspbridge: Rename words with camel case.
The intention of this patch is to rename the remaining variables with camel
case. Variables will be renamed avoiding camel case and Hungarian notation.
The words to be renamed in this patch are:
========================================
dspAddr to dsp_address
dspAdr to dsp_adr
dspBaseVirt to dsp_base_virt
dwDeviceContext to device_context
dwDSPAddrOffset to dsp_addr_offset
dwDSPAddr to dsp_addr
dwErrInfo to error_info
dwGPPBaseBA to gpp_base_ba
dwMask to mask
dwTimeout to timeout
dwTimeOut to timeout
dwValue to value
entryNum to entry_num
execFile to exec_file
fFlush to flush_data
FlushMemType to flush_mem_type
========================================
Signed-off-by: Rene Sapiens <rene.sapiens@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/tidspbridge/core/chnl_sm.c')
-rw-r--r-- | drivers/staging/tidspbridge/core/chnl_sm.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/drivers/staging/tidspbridge/core/chnl_sm.c b/drivers/staging/tidspbridge/core/chnl_sm.c index 714b6f7e4b9d..362e01e379d8 100644 --- a/drivers/staging/tidspbridge/core/chnl_sm.c +++ b/drivers/staging/tidspbridge/core/chnl_sm.c @@ -479,7 +479,7 @@ int bridge_chnl_destroy(struct chnl_mgr *hchnl_mgr) * purpose: * Flushes all the outstanding data requests on a channel. */ -int bridge_chnl_flush_io(struct chnl_object *chnl_obj, u32 dwTimeOut) +int bridge_chnl_flush_io(struct chnl_object *chnl_obj, u32 timeout) { int status = 0; struct chnl_object *pchnl = (struct chnl_object *)chnl_obj; @@ -488,7 +488,7 @@ int bridge_chnl_flush_io(struct chnl_object *chnl_obj, u32 dwTimeOut) struct chnl_ioc chnl_ioc_obj; /* Check args: */ if (pchnl) { - if ((dwTimeOut == CHNL_IOCNOWAIT) + if ((timeout == CHNL_IOCNOWAIT) && CHNL_IS_OUTPUT(pchnl->chnl_mode)) { status = -EINVAL; } else { @@ -509,7 +509,7 @@ int bridge_chnl_flush_io(struct chnl_object *chnl_obj, u32 dwTimeOut) while (!LST_IS_EMPTY(pchnl->pio_requests) && DSP_SUCCEEDED(status)) { status = bridge_chnl_get_ioc(chnl_obj, - dwTimeOut, &chnl_ioc_obj); + timeout, &chnl_ioc_obj); if (DSP_FAILED(status)) continue; @@ -566,7 +566,7 @@ int bridge_chnl_get_info(struct chnl_object *chnl_obj, * I/O request. * Note: Ensures Channel Invariant (see notes above). */ -int bridge_chnl_get_ioc(struct chnl_object *chnl_obj, u32 dwTimeOut, +int bridge_chnl_get_ioc(struct chnl_object *chnl_obj, u32 timeout, OUT struct chnl_ioc *pIOC) { int status = 0; @@ -582,7 +582,7 @@ int bridge_chnl_get_ioc(struct chnl_object *chnl_obj, u32 dwTimeOut, /* Check args: */ if (!pIOC || !pchnl) { status = -EFAULT; - } else if (dwTimeOut == CHNL_IOCNOWAIT) { + } else if (timeout == CHNL_IOCNOWAIT) { if (LST_IS_EMPTY(pchnl->pio_completions)) status = -EREMOTEIO; @@ -597,12 +597,12 @@ int bridge_chnl_get_ioc(struct chnl_object *chnl_obj, u32 dwTimeOut, goto func_end; ioc.status = CHNL_IOCSTATCOMPLETE; - if (dwTimeOut != + if (timeout != CHNL_IOCNOWAIT && LST_IS_EMPTY(pchnl->pio_completions)) { - if (dwTimeOut == CHNL_IOCINFINITE) - dwTimeOut = SYNC_INFINITE; + if (timeout == CHNL_IOCINFINITE) + timeout = SYNC_INFINITE; - stat_sync = sync_wait_on_event(pchnl->sync_event, dwTimeOut); + stat_sync = sync_wait_on_event(pchnl->sync_event, timeout); if (stat_sync == -ETIME) { /* No response from DSP */ ioc.status |= CHNL_IOCSTATTIMEOUT; @@ -663,7 +663,7 @@ int bridge_chnl_get_ioc(struct chnl_object *chnl_obj, u32 dwTimeOut, * value may be non-zero, we still have to set the event. * Therefore, this optimization is taken out. * - * if (dwTimeOut == CHNL_IOCNOWAIT) { + * if (timeout == CHNL_IOCNOWAIT) { * ... ensure event is set.. * sync_set_event(pchnl->sync_event); * } */ @@ -744,8 +744,8 @@ int bridge_chnl_get_mgr_info(struct chnl_mgr *hchnl_mgr, u32 uChnlID, * ======== bridge_chnl_idle ======== * Idles a particular channel. */ -int bridge_chnl_idle(struct chnl_object *chnl_obj, u32 dwTimeOut, - bool fFlush) +int bridge_chnl_idle(struct chnl_object *chnl_obj, u32 timeout, + bool flush_data) { s8 chnl_mode; struct chnl_mgr *chnl_mgr_obj; @@ -756,9 +756,9 @@ int bridge_chnl_idle(struct chnl_object *chnl_obj, u32 dwTimeOut, chnl_mode = chnl_obj->chnl_mode; chnl_mgr_obj = chnl_obj->chnl_mgr_obj; - if (CHNL_IS_OUTPUT(chnl_mode) && !fFlush) { + if (CHNL_IS_OUTPUT(chnl_mode) && !flush_data) { /* Wait for IO completions, up to the specified timeout: */ - status = bridge_chnl_flush_io(chnl_obj, dwTimeOut); + status = bridge_chnl_flush_io(chnl_obj, timeout); } else { status = bridge_chnl_cancel_io(chnl_obj); |