Skip to content

Commit

Permalink
staging: ti dspbridge: Rename words with camel case
Browse files Browse the repository at this point in the history 
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:
========================================
phDevContext to device_ctx
phDevNode to dev_nde
phDevObject to device_obj
phDispObject to dispatch_obj
phDmmMgr to dmm_manager
phDrvObject to drv_obj
phDRVObject to drv_obj
phIOMgr to io_man
phLoader to loader
phManager to manager
phMgrObject to mgr_obj
phMgr to mgr
phMsgMgr to msg_man
phMsgQueue to msgq
phNldrNode to nldr_nodeobj
========================================

Signed-off-by: Rene Sapiens <rene.sapiens@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Rene Sapiens authored and Greg Kroah-Hartman committed Jul 22, 2010
1 parent a512027 commit e436d07
Show file tree
Hide file tree
Showing 27 changed files with 200 additions and 200 deletions.
10 changes: 5 additions & 5 deletions drivers/staging/tidspbridge/core/io_sm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ static int register_shm_segs(struct io_mgr *hio_mgr,
* ======== bridge_io_create ========
* Create an IO manager object.
*/
int bridge_io_create(OUT struct io_mgr **phIOMgr,
int bridge_io_create(OUT struct io_mgr **io_man,
struct dev_object *hdev_obj,
IN CONST struct io_attrs *pMgrAttrs)
{
Expand All @@ -174,7 +174,7 @@ int bridge_io_create(OUT struct io_mgr **phIOMgr,
u8 dev_type;

/* Check requirements */
if (!phIOMgr || !pMgrAttrs || pMgrAttrs->word_size == 0) {
if (!io_man || !pMgrAttrs || pMgrAttrs->word_size == 0) {
status = -EFAULT;
goto func_end;
}
Expand Down Expand Up @@ -243,12 +243,12 @@ int bridge_io_create(OUT struct io_mgr **phIOMgr,
if (DSP_FAILED(status)) {
/* Cleanup */
bridge_io_destroy(pio_mgr);
if (phIOMgr)
*phIOMgr = NULL;
if (io_man)
*io_man = NULL;
} else {
/* Return IO manager object to caller... */
hchnl_mgr->hio_mgr = pio_mgr;
*phIOMgr = pio_mgr;
*io_man = pio_mgr;
}
return status;
}
Expand Down
16 changes: 8 additions & 8 deletions drivers/staging/tidspbridge/core/msg_sm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,15 @@ static void free_msg_list(struct lst_list *msg_list);
* Create an object to manage message queues. Only one of these objects
* can exist per device object.
*/
int bridge_msg_create(OUT struct msg_mgr **phMsgMgr,
int bridge_msg_create(OUT struct msg_mgr **msg_man,
struct dev_object *hdev_obj,
msg_onexit msg_callback)
{
struct msg_mgr *msg_mgr_obj;
struct io_mgr *hio_mgr;
int status = 0;

if (!phMsgMgr || !msg_callback || !hdev_obj) {
if (!msg_man || !msg_callback || !hdev_obj) {
status = -EFAULT;
goto func_end;
}
Expand All @@ -65,7 +65,7 @@ int bridge_msg_create(OUT struct msg_mgr **phMsgMgr,
status = -EFAULT;
goto func_end;
}
*phMsgMgr = NULL;
*msg_man = NULL;
/* Allocate msg_ctrl manager object */
msg_mgr_obj = kzalloc(sizeof(struct msg_mgr), GFP_KERNEL);

Expand Down Expand Up @@ -103,7 +103,7 @@ int bridge_msg_create(OUT struct msg_mgr **phMsgMgr,
sync_init_event(msg_mgr_obj->sync_event);

if (DSP_SUCCEEDED(status))
*phMsgMgr = msg_mgr_obj;
*msg_man = msg_mgr_obj;
else
delete_msg_mgr(msg_mgr_obj);

Expand All @@ -120,20 +120,20 @@ int bridge_msg_create(OUT struct msg_mgr **phMsgMgr,
* on the DSP.
*/
int bridge_msg_create_queue(struct msg_mgr *hmsg_mgr,
OUT struct msg_queue **phMsgQueue,
OUT struct msg_queue **msgq,
u32 msgq_id, u32 max_msgs, void *arg)
{
u32 i;
u32 num_allocated = 0;
struct msg_queue *msg_q;
int status = 0;

if (!hmsg_mgr || phMsgQueue == NULL || !hmsg_mgr->msg_free_list) {
if (!hmsg_mgr || msgq == NULL || !hmsg_mgr->msg_free_list) {
status = -EFAULT;
goto func_end;
}

*phMsgQueue = NULL;
*msgq = NULL;
/* Allocate msg_queue object */
msg_q = kzalloc(sizeof(struct msg_queue), GFP_KERNEL);
if (!msg_q) {
Expand Down Expand Up @@ -217,7 +217,7 @@ int bridge_msg_create_queue(struct msg_mgr *hmsg_mgr,
} else {
lst_put_tail(hmsg_mgr->queue_list,
(struct list_head *)msg_q);
*phMsgQueue = msg_q;
*msgq = msg_q;
/* Signal that free frames are now available */
if (!LST_IS_EMPTY(hmsg_mgr->msg_free_list))
sync_set_event(hmsg_mgr->sync_event);
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/tidspbridge/include/dspbridge/cfg.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ extern int cfg_get_cd_version(OUT u32 *version);
* value: Ptr to location to store the value.
* Returns:
* 0: Success.
* -EFAULT: dev_node_obj is invalid or phDevObject is invalid.
* -EFAULT: dev_node_obj is invalid or device_obj is invalid.
* -ENODATA: The resource is not available.
* Requires:
* CFG initialized.
Expand Down
10 changes: 5 additions & 5 deletions drivers/staging/tidspbridge/include/dspbridge/cod.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ extern void cod_close(struct cod_libraryobj *lib);
* Symbol table information is managed by this object and can be retrieved
* using the cod_get_sym_value() function.
* Parameters:
* phManager: created manager object
* manager: created manager object
* pstrZLFile: ZL DLL filename, of length < COD_MAXPATHLENGTH.
* attrs: attributes to be used by this object. A NULL value
* will cause default attrs to be used.
Expand All @@ -91,7 +91,7 @@ extern void cod_close(struct cod_libraryobj *lib);
* pstrZLFile != NULL
* Ensures:
*/
extern int cod_create(OUT struct cod_manager **phManager,
extern int cod_create(OUT struct cod_manager **manager,
char *pstrZLFile,
IN OPTIONAL CONST struct cod_attrs *attrs);

Expand Down Expand Up @@ -187,17 +187,17 @@ extern int cod_get_entry(struct cod_manager *cod_mgr_obj,
* Get handle to the DBL loader.
* Parameters:
* cod_mgr_obj: handle of manager to be deleted
* phLoader: location to store loader handle on output.
* loader: location to store loader handle on output.
* Returns:
* 0: Success.
* Requires:
* COD module initialized.
* valid cod_mgr_obj.
* phLoader != NULL.
* loader != NULL.
* Ensures:
*/
extern int cod_get_loader(struct cod_manager *cod_mgr_obj,
struct dbll_tar_obj **phLoader);
struct dbll_tar_obj **loader);

/*
* ======== cod_get_section ========
Expand Down
82 changes: 41 additions & 41 deletions drivers/staging/tidspbridge/include/dspbridge/dev.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ extern u32 dev_brd_write_fxn(void *arb,
* Called by the operating system to load the Bridge Driver for a
* 'Bridge device.
* Parameters:
* phDevObject: Ptr to location to receive the device object handle.
* device_obj: Ptr to location to receive the device object handle.
* driver_file_name: Name of Bridge driver PE DLL file to load. If the
* absolute path is not provided, the file is loaded
* through 'Bridge's module search path.
Expand All @@ -80,17 +80,17 @@ extern u32 dev_brd_write_fxn(void *arb,
* -ESPIPE: Unable to load ZL DLL.
* Requires:
* DEV Initialized.
* phDevObject != NULL.
* device_obj != NULL.
* driver_file_name != NULL.
* pHostConfig != NULL.
* pDspConfig != NULL.
* Ensures:
* 0: *phDevObject will contain handle to the new device object.
* 0: *device_obj will contain handle to the new device object.
* Otherwise, does not create the device object, ensures the Bridge driver
* module is unloaded, and sets *phDevObject to NULL.
* module is unloaded, and sets *device_obj to NULL.
*/
extern int dev_create_device(OUT struct dev_object
**phDevObject,
**device_obj,
IN CONST char *driver_file_name,
struct cfg_devnode *dev_node_obj);

Expand All @@ -99,7 +99,7 @@ extern int dev_create_device(OUT struct dev_object
* Purpose:
* Called by the operating system to load the Bridge Driver for IVA.
* Parameters:
* phDevObject: Ptr to location to receive the device object handle.
* device_obj: Ptr to location to receive the device object handle.
* driver_file_name: Name of Bridge driver PE DLL file to load. If the
* absolute path is not provided, the file is loaded
* through 'Bridge's module search path.
Expand All @@ -115,17 +115,17 @@ extern int dev_create_device(OUT struct dev_object
* -ESPIPE: Unable to load ZL DLL.
* Requires:
* DEV Initialized.
* phDevObject != NULL.
* device_obj != NULL.
* driver_file_name != NULL.
* pHostConfig != NULL.
* pDspConfig != NULL.
* Ensures:
* 0: *phDevObject will contain handle to the new device object.
* 0: *device_obj will contain handle to the new device object.
* Otherwise, does not create the device object, ensures the Bridge driver
* module is unloaded, and sets *phDevObject to NULL.
* module is unloaded, and sets *device_obj to NULL.
*/
extern int dev_create_iva_device(OUT struct dev_object
**phDevObject,
**device_obj,
IN CONST char *driver_file_name,
IN CONST struct cfg_hostres
*pHostConfig,
Expand Down Expand Up @@ -195,20 +195,20 @@ extern int dev_destroy_device(struct dev_object
* Parameters:
* hdev_obj: Handle to device object created with
* dev_create_device().
* *phMgr: Ptr to location to store handle.
* *mgr: Ptr to location to store handle.
* Returns:
* 0: Success.
* -EFAULT: Invalid hdev_obj.
* Requires:
* phMgr != NULL.
* mgr != NULL.
* DEV Initialized.
* Ensures:
* 0: *phMgr contains a handle to a channel manager object,
* 0: *mgr contains a handle to a channel manager object,
* or NULL.
* else: *phMgr is NULL.
* else: *mgr is NULL.
*/
extern int dev_get_chnl_mgr(struct dev_object *hdev_obj,
OUT struct chnl_mgr **phMgr);
OUT struct chnl_mgr **mgr);

/*
* ======== dev_get_cmm_mgr ========
Expand All @@ -218,20 +218,20 @@ extern int dev_get_chnl_mgr(struct dev_object *hdev_obj,
* Parameters:
* hdev_obj: Handle to device object created with
* dev_create_device().
* *phMgr: Ptr to location to store handle.
* *mgr: Ptr to location to store handle.
* Returns:
* 0: Success.
* -EFAULT: Invalid hdev_obj.
* Requires:
* phMgr != NULL.
* mgr != NULL.
* DEV Initialized.
* Ensures:
* 0: *phMgr contains a handle to a channel manager object,
* 0: *mgr contains a handle to a channel manager object,
* or NULL.
* else: *phMgr is NULL.
* else: *mgr is NULL.
*/
extern int dev_get_cmm_mgr(struct dev_object *hdev_obj,
OUT struct cmm_object **phMgr);
OUT struct cmm_object **mgr);

/*
* ======== dev_get_dmm_mgr ========
Expand All @@ -241,20 +241,20 @@ extern int dev_get_cmm_mgr(struct dev_object *hdev_obj,
* Parameters:
* hdev_obj: Handle to device object created with
* dev_create_device().
* *phMgr: Ptr to location to store handle.
* *mgr: Ptr to location to store handle.
* Returns:
* 0: Success.
* -EFAULT: Invalid hdev_obj.
* Requires:
* phMgr != NULL.
* mgr != NULL.
* DEV Initialized.
* Ensures:
* 0: *phMgr contains a handle to a channel manager object,
* 0: *mgr contains a handle to a channel manager object,
* or NULL.
* else: *phMgr is NULL.
* else: *mgr is NULL.
*/
extern int dev_get_dmm_mgr(struct dev_object *hdev_obj,
OUT struct dmm_object **phMgr);
OUT struct dmm_object **mgr);

/*
* ======== dev_get_cod_mgr ========
Expand Down Expand Up @@ -304,19 +304,19 @@ extern int dev_get_deh_mgr(struct dev_object *hdev_obj,
* Parameters:
* hdev_obj: Handle to device object created with
* dev_create_device().
* phDevNode: Ptr to location to get the device node handle.
* dev_nde: Ptr to location to get the device node handle.
* Returns:
* 0: Returns a DEVNODE in *dev_node_obj.
* -EFAULT: Invalid hdev_obj.
* Requires:
* phDevNode != NULL.
* dev_nde != NULL.
* DEV Initialized.
* Ensures:
* 0: *phDevNode contains a platform specific device ID;
* else: *phDevNode is NULL.
* 0: *dev_nde contains a platform specific device ID;
* else: *dev_nde is NULL.
*/
extern int dev_get_dev_node(struct dev_object *hdev_obj,
OUT struct cfg_devnode **phDevNode);
OUT struct cfg_devnode **dev_nde);

/*
* ======== dev_get_dev_type ========
Expand All @@ -325,16 +325,16 @@ extern int dev_get_dev_node(struct dev_object *hdev_obj,
* Parameters:
* hdev_obj: Handle to device object created with
* dev_create_device().
* phDevNode: Ptr to location to get the device node handle.
* dev_nde: Ptr to location to get the device node handle.
* Returns:
* 0: Success
* -EFAULT: Invalid hdev_obj.
* Requires:
* phDevNode != NULL.
* dev_nde != NULL.
* DEV Initialized.
* Ensures:
* 0: *phDevNode contains a platform specific device ID;
* else: *phDevNode is NULL.
* 0: *dev_nde contains a platform specific device ID;
* else: *dev_nde is NULL.
*/
extern int dev_get_dev_type(struct dev_object *device_obj,
u8 *dev_type);
Expand Down Expand Up @@ -389,19 +389,19 @@ extern int dev_get_intf_fxns(struct dev_object *hdev_obj,
* Parameters:
* hdev_obj: Handle to device object created with
* dev_create_device().
* *phMgr: Ptr to location to store handle.
* *mgr: Ptr to location to store handle.
* Returns:
* 0: Success.
* -EFAULT: Invalid hdev_obj.
* Requires:
* phMgr != NULL.
* mgr != NULL.
* DEV Initialized.
* Ensures:
* 0: *phMgr contains a handle to an IO manager object.
* else: *phMgr is NULL.
* 0: *mgr contains a handle to an IO manager object.
* else: *mgr is NULL.
*/
extern int dev_get_io_mgr(struct dev_object *hdev_obj,
OUT struct io_mgr **phMgr);
OUT struct io_mgr **mgr);

/*
* ======== dev_get_next ========
Expand Down Expand Up @@ -434,7 +434,7 @@ extern struct dev_object *dev_get_next(struct dev_object
* Retrieve the msg_ctrl Manager Handle from the DevObject.
* Parameters:
* hdev_obj: Handle to the Dev Object
* phMsgMgr: Location where msg_ctrl Manager handle will be returned.
* msg_man: Location where msg_ctrl Manager handle will be returned.
* Returns:
* Requires:
* DEV Initialized.
Expand All @@ -443,7 +443,7 @@ extern struct dev_object *dev_get_next(struct dev_object
* Ensures:
*/
extern void dev_get_msg_mgr(struct dev_object *hdev_obj,
OUT struct msg_mgr **phMsgMgr);
OUT struct msg_mgr **msg_man);

/*
* ========= dev_get_node_manager ========
Expand Down
Loading

0 comments on commit e436d07

Please sign in to comment.