Commit a8b42ea4 authored by Masood Mehmood's avatar Masood Mehmood Committed by Greg Kroah-Hartman
Browse files

Staging:tidspbridge: Fixed braces, spaces and long line coding style 



This patch applies following code style changes to the whole driver.

- Removing braces from single statements following a 'if' statement.
- Removing unnessasary spaces and braces from files.
- Re-order statements crossing 80 columns limitation.
- Fixed one quoted string split across lines.

Signed-off-by: default avatarMasood Mehmood <ody.guru@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cec2e7bb

drivers/staging/tidspbridge/core/tiomap3430_pwr.c

+9 −6
Original line number Original line Diff line number Diff line
@@ -99,7 +99,8 @@ int handle_hibernation_from_dsp(struct bridge_dev_context *dev_context) 
			return -EPERM;

			return -EPERM;

		}

		}

		pwr_state = (*pdata->dsp_prm_read)(OMAP3430_IVA2_MOD,

		pwr_state = (*pdata->dsp_prm_read)(OMAP3430_IVA2_MOD,

					OMAP2_PM_PWSTST) & OMAP_POWERSTATEST_MASK;

						   OMAP2_PM_PWSTST) &

						   OMAP_POWERSTATEST_MASK;

	}

	}

	if (timeout == 0) {

	if (timeout == 0) {

		pr_err("%s: Timed out waiting for DSP off mode\n", __func__);

		pr_err("%s: Timed out waiting for DSP off mode\n", __func__);
@@ -209,7 +210,8 @@ int sleep_dsp(struct bridge_dev_context *dev_context, u32 dw_cmd, 
			return -EPERM;

			return -EPERM;

		}

		}

		pwr_state = (*pdata->dsp_prm_read)(OMAP3430_IVA2_MOD,

		pwr_state = (*pdata->dsp_prm_read)(OMAP3430_IVA2_MOD,

					OMAP2_PM_PWSTST) & OMAP_POWERSTATEST_MASK;

						   OMAP2_PM_PWSTST) &

						   OMAP_POWERSTATEST_MASK;

	}

	}





	if (!timeout) {

	if (!timeout) {
@@ -355,7 +357,7 @@ int pre_scale_dsp(struct bridge_dev_context *dev_context, void *pargs) 
	    (dev_context->brd_state == BRD_DSP_HIBERNATION)) {

	    (dev_context->brd_state == BRD_DSP_HIBERNATION)) {

		dev_dbg(bridge, "OPP: %s IVA in sleep. No message to DSP\n");

		dev_dbg(bridge, "OPP: %s IVA in sleep. No message to DSP\n");

		return 0;

		return 0;

	} else if ((dev_context->brd_state == BRD_RUNNING)) {

	} else if (dev_context->brd_state == BRD_RUNNING) {

		/* Send a prenotification to DSP */

		/* Send a prenotification to DSP */

		dev_dbg(bridge, "OPP: %s sent notification to DSP\n", __func__);

		dev_dbg(bridge, "OPP: %s sent notification to DSP\n", __func__);

		sm_interrupt_dsp(dev_context, MBX_PM_SETPOINT_PRENOTIFY);

		sm_interrupt_dsp(dev_context, MBX_PM_SETPOINT_PRENOTIFY);
@@ -396,13 +398,14 @@ int post_scale_dsp(struct bridge_dev_context *dev_context, 
		io_sh_msetting(hio_mgr, SHM_CURROPP, &level);

		io_sh_msetting(hio_mgr, SHM_CURROPP, &level);

		dev_dbg(bridge, "OPP: %s IVA in sleep. Wrote to shm\n",

		dev_dbg(bridge, "OPP: %s IVA in sleep. Wrote to shm\n",

			__func__);

			__func__);

	} else if ((dev_context->brd_state == BRD_RUNNING)) {

	} else if (dev_context->brd_state == BRD_RUNNING) {

		/* Update the OPP value in shared memory */

		/* Update the OPP value in shared memory */

		io_sh_msetting(hio_mgr, SHM_CURROPP, &level);

		io_sh_msetting(hio_mgr, SHM_CURROPP, &level);

		/* Send a post notification to DSP */

		/* Send a post notification to DSP */

		sm_interrupt_dsp(dev_context, MBX_PM_SETPOINT_POSTNOTIFY);

		sm_interrupt_dsp(dev_context, MBX_PM_SETPOINT_POSTNOTIFY);

		dev_dbg(bridge, "OPP: %s wrote to shm. Sent post notification "

		dev_dbg(bridge,

			"to DSP\n", __func__);

			"OPP: %s wrote to shm. Sent post notification to DSP\n",

			 __func__);

	} else {

	} else {

		status = -EPERM;

		status = -EPERM;

	}

	}

drivers/staging/tidspbridge/rmgr/nldr.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -1751,10 +1751,9 @@ static void unload_ovly(struct nldr_nodeobject *nldr_node_obj, 
	}

	}

	if (ref_count && (*ref_count > 0)) {

	if (ref_count && (*ref_count > 0)) {

		*ref_count -= 1;

		*ref_count -= 1;

		if (other_ref) {

		if (other_ref)

			*other_ref -= 1;

			*other_ref -= 1;

	}

	}

	}





	if (ref_count && *ref_count == 0) {

	if (ref_count && *ref_count == 0) {

		/* 'Deallocate' memory */

		/* 'Deallocate' memory */

drivers/staging/tidspbridge/rmgr/node.c

+7 −7
Original line number Original line Diff line number Diff line
@@ -703,9 +703,9 @@ DBAPI node_alloc_msg_buf(struct node_object *hnode, u32 usize, 
		pattr = &node_dfltbufattrs;	/* set defaults */

		pattr = &node_dfltbufattrs;	/* set defaults */





	status = proc_get_processor_id(pnode->processor, &proc_id);

	status = proc_get_processor_id(pnode->processor, &proc_id);

	if (proc_id != DSP_UNIT) {

	if (proc_id != DSP_UNIT)

		goto func_end;

		goto func_end;

	}



	/*  If segment ID includes MEM_SETVIRTUALSEGID then pbuffer is a

	/*  If segment ID includes MEM_SETVIRTUALSEGID then pbuffer is a

	 *  virt  address, so set this info in this node's translator

	 *  virt  address, so set this info in this node's translator

	 *  object for  future ref. If MEM_GETVIRTUALSEGID then retrieve

	 *  object for  future ref. If MEM_GETVIRTUALSEGID then retrieve
@@ -886,11 +886,10 @@ int node_connect(struct node_object *node1, u32 stream1, 
	if (pattrs && pattrs->strm_mode != STRMMODE_PROCCOPY)

	if (pattrs && pattrs->strm_mode != STRMMODE_PROCCOPY)

		return -EPERM;	/* illegal stream mode */

		return -EPERM;	/* illegal stream mode */





	if (node1_type != NODE_GPP) {

	if (node1_type != NODE_GPP)

		hnode_mgr = node1->node_mgr;

		hnode_mgr = node1->node_mgr;

	} else {

	else

		hnode_mgr = node2->node_mgr;

		hnode_mgr = node2->node_mgr;

	}





	/* Enter critical section */

	/* Enter critical section */

	mutex_lock(&hnode_mgr->node_mgr_lock);

	mutex_lock(&hnode_mgr->node_mgr_lock);
@@ -2322,7 +2321,8 @@ int node_terminate(struct node_object *hnode, int *pstatus) 
			if (!hdeh_mgr)

			if (!hdeh_mgr)

				goto func_cont;

				goto func_cont;





			bridge_deh_notify(hdeh_mgr, DSP_SYSERROR, DSP_EXCEPTIONABORT);

			bridge_deh_notify(hdeh_mgr, DSP_SYSERROR,

					  DSP_EXCEPTIONABORT);

		}

		}

	}

	}

func_cont:

func_cont:

drivers/staging/tidspbridge/core/io_sm.c

+1 −1

File changed.

Contains only whitespace changes.