Commit e17ba7f2 authored by Rene Sapiens's avatar Rene Sapiens Committed by Omar Ramirez Luna
Browse files

staging: tidspbridge: set4 remove hungarian from structs 



hungarian notation will be removed from the elements inside
structures, the next varibles will be renamed:

Original:                Replacement:
pfn_brd_set_state        brd_set_state
pfn_brd_start            brd_start
pfn_brd_status           brd_status
pfn_brd_stop             brd_stop
pfn_brd_write            brd_write
pfn_chnl_add_io_req      chnl_add_io_req
pfn_chnl_cancel_io       chnl_cancel_io
pfn_chnl_close           chnl_close
pfn_chnl_create          chnl_create
pfn_chnl_destroy         chnl_destroy
pfn_chnl_flush_io        chnl_flush_io
pfn_chnl_get_info        chnl_get_info
pfn_chnl_get_ioc         chnl_get_ioc
pfn_chnl_get_mgr_info    chnl_get_mgr_info
pfn_chnl_idle            chnl_idle
pfn_chnl_open            chnl_open
pfn_chnl_register_notify chnl_register_notify
pfn_create		 create
pfn_delete		 delete
pfn_dev_cntrl		 dev_cntrl

Signed-off-by: default avatarRene Sapiens <rene.sapiens@ti.com>
Signed-off-by: default avatarArmando Uribe <x0095078@ti.com>
Signed-off-by: default avatarOmar Ramirez Luna <omar.ramirez@ti.com>
parent 3c882de5

drivers/staging/tidspbridge/core/io_sm.c

+4 −4
Original line number Diff line number Diff line
@@ -683,7 +683,7 @@ int bridge_io_on_loaded(struct io_mgr *hio_mgr) 
		 */



		status =

		    hio_mgr->intf_fxns->pfn_dev_cntrl(hio_mgr->hbridge_context,

		    hio_mgr->intf_fxns->dev_cntrl(hio_mgr->hbridge_context,

						      BRDIOCTL_SETMMUCONFIG,

						      ae_proc);

		if (status)
@@ -829,7 +829,7 @@ static void io_dispatch_pm(struct io_mgr *pio_mgr) 
	if (parg[0] == MBX_PM_HIBERNATE_EN) {

		dev_dbg(bridge, "PM: Hibernate command\n");

		status = pio_mgr->intf_fxns->

				pfn_dev_cntrl(pio_mgr->hbridge_context,

				dev_cntrl(pio_mgr->hbridge_context,

					      BRDIOCTL_PWR_HIBERNATE, parg);

		if (status)

			pr_err("%s: hibernate cmd failed 0x%x\n",
@@ -838,7 +838,7 @@ static void io_dispatch_pm(struct io_mgr *pio_mgr) 
		parg[1] = pio_mgr->shared_mem->opp_request.rqst_opp_pt;

		dev_dbg(bridge, "PM: Requested OPP = 0x%x\n", parg[1]);

		status = pio_mgr->intf_fxns->

				pfn_dev_cntrl(pio_mgr->hbridge_context,

				dev_cntrl(pio_mgr->hbridge_context,

					BRDIOCTL_CONSTRAINT_REQUEST, parg);

		if (status)

			dev_dbg(bridge, "PM: Failed to set constraint "
@@ -847,7 +847,7 @@ static void io_dispatch_pm(struct io_mgr *pio_mgr) 
		dev_dbg(bridge, "PM: clk control value of msg = 0x%x\n",

			parg[0]);

		status = pio_mgr->intf_fxns->

				pfn_dev_cntrl(pio_mgr->hbridge_context,

				dev_cntrl(pio_mgr->hbridge_context,

					      BRDIOCTL_CLK_CTRL, parg);

		if (status)

			dev_dbg(bridge, "PM: Failed to ctrl the DSP clk"

drivers/staging/tidspbridge/include/dspbridge/dspdefs.h

+18 −18
Original line number Diff line number Diff line
@@ -977,32 +977,32 @@ struct bridge_drv_interface { 
	u32 brd_api_minor_version;	/* Set to BRD_API_MINOR_VERSION. */

	fxn_dev_create pfn_dev_create;	/* Create device context */

	fxn_dev_destroy pfn_dev_destroy;	/* Destroy device context */

	fxn_dev_ctrl pfn_dev_cntrl;	/* Optional vendor interface */

	fxn_dev_ctrl dev_cntrl;	/* Optional vendor interface */

	fxn_brd_monitor brd_monitor;	/* Load and/or start monitor */

	fxn_brd_start pfn_brd_start;	/* Start DSP program. */

	fxn_brd_stop pfn_brd_stop;	/* Stop/reset board. */

	fxn_brd_status pfn_brd_status;	/* Get current board status. */

	fxn_brd_start brd_start;	/* Start DSP program. */

	fxn_brd_stop brd_stop;	/* Stop/reset board. */

	fxn_brd_status brd_status;	/* Get current board status. */

	fxn_brd_read brd_read;	/* Read board memory */

	fxn_brd_write pfn_brd_write;	/* Write board memory. */

	fxn_brd_setstate pfn_brd_set_state;	/* Sets the Board State */

	fxn_brd_write brd_write;	/* Write board memory. */

	fxn_brd_setstate brd_set_state;	/* Sets the Board State */

	fxn_brd_memcopy brd_mem_copy;	/* Copies DSP Memory */

	fxn_brd_memwrite brd_mem_write;	/* Write DSP Memory w/o halt */

	fxn_brd_memmap brd_mem_map;	/* Maps MPU mem to DSP mem */

	fxn_brd_memunmap brd_mem_un_map;	/* Unmaps MPU mem to DSP mem */

	fxn_chnl_create pfn_chnl_create;	/* Create channel manager. */

	fxn_chnl_destroy pfn_chnl_destroy;	/* Destroy channel manager. */

	fxn_chnl_open pfn_chnl_open;	/* Create a new channel. */

	fxn_chnl_close pfn_chnl_close;	/* Close a channel. */

	fxn_chnl_addioreq pfn_chnl_add_io_req;	/* Req I/O on a channel. */

	fxn_chnl_getioc pfn_chnl_get_ioc;	/* Wait for I/O completion. */

	fxn_chnl_cancelio pfn_chnl_cancel_io;	/* Cancl I/O on a channel. */

	fxn_chnl_flushio pfn_chnl_flush_io;	/* Flush I/O. */

	fxn_chnl_getinfo pfn_chnl_get_info;	/* Get channel specific info */

	fxn_chnl_create chnl_create;	/* Create channel manager. */

	fxn_chnl_destroy chnl_destroy;	/* Destroy channel manager. */

	fxn_chnl_open chnl_open;	/* Create a new channel. */

	fxn_chnl_close chnl_close;	/* Close a channel. */

	fxn_chnl_addioreq chnl_add_io_req;	/* Req I/O on a channel. */

	fxn_chnl_getioc chnl_get_ioc;	/* Wait for I/O completion. */

	fxn_chnl_cancelio chnl_cancel_io;	/* Cancl I/O on a channel. */

	fxn_chnl_flushio chnl_flush_io;	/* Flush I/O. */

	fxn_chnl_getinfo chnl_get_info;	/* Get channel specific info */

	/* Get channel manager info. */

	fxn_chnl_getmgrinfo pfn_chnl_get_mgr_info;

	fxn_chnl_idle pfn_chnl_idle;	/* Idle the channel */

	fxn_chnl_getmgrinfo chnl_get_mgr_info;

	fxn_chnl_idle chnl_idle;	/* Idle the channel */

	/* Register for notif. */

	fxn_chnl_registernotify pfn_chnl_register_notify;

	fxn_chnl_registernotify chnl_register_notify;

	fxn_io_create pfn_io_create;	/* Create IO manager */

	fxn_io_destroy pfn_io_destroy;	/* Destroy IO manager */

	fxn_io_onloaded pfn_io_on_loaded;	/* Notify of program loaded */

drivers/staging/tidspbridge/include/dspbridge/nldrdefs.h

+2 −2
Original line number Diff line number Diff line
@@ -281,8 +281,8 @@ typedef int(*nldr_unloadfxn) (struct nldr_nodeobject *nldr_node_obj, 
 */

struct node_ldr_fxns {

	nldr_allocatefxn allocate;

	nldr_createfxn pfn_create;

	nldr_deletefxn pfn_delete;

	nldr_createfxn create;

	nldr_deletefxn delete;

	nldr_exitfxn pfn_exit;

	nldr_getfxnaddrfxn pfn_get_fxn_addr;

	nldr_initfxn pfn_init;

drivers/staging/tidspbridge/pmgr/chnl.c

+2 −2
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ int chnl_create(struct chnl_mgr **channel_mgr, 
		struct bridge_drv_interface *intf_fxns;

		dev_get_intf_fxns(hdev_obj, &intf_fxns);

		/* Let Bridge channel module finish the create: */

		status = (*intf_fxns->pfn_chnl_create) (&hchnl_mgr, hdev_obj,

		status = (*intf_fxns->chnl_create) (&hchnl_mgr, hdev_obj,

							mgr_attrts);

		if (!status) {

			/* Fill in DSP API channel module's fields of the
@@ -120,7 +120,7 @@ int chnl_destroy(struct chnl_mgr *hchnl_mgr) 
	if (chnl_mgr_obj) {

		intf_fxns = chnl_mgr_obj->intf_fxns;

		/* Let Bridge channel module destroy the chnl_mgr: */

		status = (*intf_fxns->pfn_chnl_destroy) (hchnl_mgr);

		status = (*intf_fxns->chnl_destroy) (hchnl_mgr);

	} else {

		status = -EFAULT;

	}

drivers/staging/tidspbridge/pmgr/dev.c

+36 −36
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ u32 dev_brd_write_fxn(void *arb, u32 dsp_add, void *host_buf, 
	if (dev_obj) {

		/* Require of BrdWrite() */

		DBC_ASSERT(dev_obj->hbridge_context != NULL);

		status = (*dev_obj->bridge_interface.pfn_brd_write) (

		status = (*dev_obj->bridge_interface.brd_write) (

					dev_obj->hbridge_context, host_buf,

					dsp_add, ul_num_bytes, mem_space);

		/* Special case of getting the address only */
@@ -1081,30 +1081,30 @@ static void store_interface_fxns(struct bridge_drv_interface *drv_fxns, 
	if (bridge_version > 0) {

		STORE_FXN(fxn_dev_create, pfn_dev_create);

		STORE_FXN(fxn_dev_destroy, pfn_dev_destroy);

		STORE_FXN(fxn_dev_ctrl, pfn_dev_cntrl);

		STORE_FXN(fxn_dev_ctrl, dev_cntrl);

		STORE_FXN(fxn_brd_monitor, brd_monitor);

		STORE_FXN(fxn_brd_start, pfn_brd_start);

		STORE_FXN(fxn_brd_stop, pfn_brd_stop);

		STORE_FXN(fxn_brd_status, pfn_brd_status);

		STORE_FXN(fxn_brd_start, brd_start);

		STORE_FXN(fxn_brd_stop, brd_stop);

		STORE_FXN(fxn_brd_status, brd_status);

		STORE_FXN(fxn_brd_read, brd_read);

		STORE_FXN(fxn_brd_write, pfn_brd_write);

		STORE_FXN(fxn_brd_setstate, pfn_brd_set_state);

		STORE_FXN(fxn_brd_write, brd_write);

		STORE_FXN(fxn_brd_setstate, brd_set_state);

		STORE_FXN(fxn_brd_memcopy, brd_mem_copy);

		STORE_FXN(fxn_brd_memwrite, brd_mem_write);

		STORE_FXN(fxn_brd_memmap, brd_mem_map);

		STORE_FXN(fxn_brd_memunmap, brd_mem_un_map);

		STORE_FXN(fxn_chnl_create, pfn_chnl_create);

		STORE_FXN(fxn_chnl_destroy, pfn_chnl_destroy);

		STORE_FXN(fxn_chnl_open, pfn_chnl_open);

		STORE_FXN(fxn_chnl_close, pfn_chnl_close);

		STORE_FXN(fxn_chnl_addioreq, pfn_chnl_add_io_req);

		STORE_FXN(fxn_chnl_getioc, pfn_chnl_get_ioc);

		STORE_FXN(fxn_chnl_cancelio, pfn_chnl_cancel_io);

		STORE_FXN(fxn_chnl_flushio, pfn_chnl_flush_io);

		STORE_FXN(fxn_chnl_getinfo, pfn_chnl_get_info);

		STORE_FXN(fxn_chnl_getmgrinfo, pfn_chnl_get_mgr_info);

		STORE_FXN(fxn_chnl_idle, pfn_chnl_idle);

		STORE_FXN(fxn_chnl_registernotify, pfn_chnl_register_notify);

		STORE_FXN(fxn_chnl_create, chnl_create);

		STORE_FXN(fxn_chnl_destroy, chnl_destroy);

		STORE_FXN(fxn_chnl_open, chnl_open);

		STORE_FXN(fxn_chnl_close, chnl_close);

		STORE_FXN(fxn_chnl_addioreq, chnl_add_io_req);

		STORE_FXN(fxn_chnl_getioc, chnl_get_ioc);

		STORE_FXN(fxn_chnl_cancelio, chnl_cancel_io);

		STORE_FXN(fxn_chnl_flushio, chnl_flush_io);

		STORE_FXN(fxn_chnl_getinfo, chnl_get_info);

		STORE_FXN(fxn_chnl_getmgrinfo, chnl_get_mgr_info);

		STORE_FXN(fxn_chnl_idle, chnl_idle);

		STORE_FXN(fxn_chnl_registernotify, chnl_register_notify);

		STORE_FXN(fxn_io_create, pfn_io_create);

		STORE_FXN(fxn_io_destroy, pfn_io_destroy);

		STORE_FXN(fxn_io_onloaded, pfn_io_on_loaded);
@@ -1122,25 +1122,25 @@ static void store_interface_fxns(struct bridge_drv_interface *drv_fxns, 
	/* Ensure postcondition: */

	DBC_ENSURE(intf_fxns->pfn_dev_create != NULL);

	DBC_ENSURE(intf_fxns->pfn_dev_destroy != NULL);

	DBC_ENSURE(intf_fxns->pfn_dev_cntrl != NULL);

	DBC_ENSURE(intf_fxns->dev_cntrl != NULL);

	DBC_ENSURE(intf_fxns->brd_monitor != NULL);

	DBC_ENSURE(intf_fxns->pfn_brd_start != NULL);

	DBC_ENSURE(intf_fxns->pfn_brd_stop != NULL);

	DBC_ENSURE(intf_fxns->pfn_brd_status != NULL);

	DBC_ENSURE(intf_fxns->brd_start != NULL);

	DBC_ENSURE(intf_fxns->brd_stop != NULL);

	DBC_ENSURE(intf_fxns->brd_status != NULL);

	DBC_ENSURE(intf_fxns->brd_read != NULL);

	DBC_ENSURE(intf_fxns->pfn_brd_write != NULL);

	DBC_ENSURE(intf_fxns->pfn_chnl_create != NULL);

	DBC_ENSURE(intf_fxns->pfn_chnl_destroy != NULL);

	DBC_ENSURE(intf_fxns->pfn_chnl_open != NULL);

	DBC_ENSURE(intf_fxns->pfn_chnl_close != NULL);

	DBC_ENSURE(intf_fxns->pfn_chnl_add_io_req != NULL);

	DBC_ENSURE(intf_fxns->pfn_chnl_get_ioc != NULL);

	DBC_ENSURE(intf_fxns->pfn_chnl_cancel_io != NULL);

	DBC_ENSURE(intf_fxns->pfn_chnl_flush_io != NULL);

	DBC_ENSURE(intf_fxns->pfn_chnl_get_info != NULL);

	DBC_ENSURE(intf_fxns->pfn_chnl_get_mgr_info != NULL);

	DBC_ENSURE(intf_fxns->pfn_chnl_idle != NULL);

	DBC_ENSURE(intf_fxns->pfn_chnl_register_notify != NULL);

	DBC_ENSURE(intf_fxns->brd_write != NULL);

	DBC_ENSURE(intf_fxns->chnl_create != NULL);

	DBC_ENSURE(intf_fxns->chnl_destroy != NULL);

	DBC_ENSURE(intf_fxns->chnl_open != NULL);

	DBC_ENSURE(intf_fxns->chnl_close != NULL);

	DBC_ENSURE(intf_fxns->chnl_add_io_req != NULL);

	DBC_ENSURE(intf_fxns->chnl_get_ioc != NULL);

	DBC_ENSURE(intf_fxns->chnl_cancel_io != NULL);

	DBC_ENSURE(intf_fxns->chnl_flush_io != NULL);

	DBC_ENSURE(intf_fxns->chnl_get_info != NULL);

	DBC_ENSURE(intf_fxns->chnl_get_mgr_info != NULL);

	DBC_ENSURE(intf_fxns->chnl_idle != NULL);

	DBC_ENSURE(intf_fxns->chnl_register_notify != NULL);

	DBC_ENSURE(intf_fxns->pfn_io_create != NULL);

	DBC_ENSURE(intf_fxns->pfn_io_destroy != NULL);

	DBC_ENSURE(intf_fxns->pfn_io_on_loaded != NULL);