Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 451ff373 authored by Jochen Maes's avatar Jochen Maes Committed by Greg Kroah-Hartman
Browse files

staging: dream: another Codestyle patch 



Fixed code style issues.

Signed-off-by: default avatarJochen Maes <jochen.maes@sejo.be>
Acked-by: default avatarPavel Machek <pavel@ucw.cz>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent df16b962

drivers/staging/dream/camera/msm_camera.c

+30 −33
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
 * Copyright (C) 2008-2009 QUALCOMM Incorporated.

 */



//FIXME: most allocations need not be GFP_ATOMIC

/* FIXME: most allocations need not be GFP_ATOMIC

/* FIXME: management of mutexes */

/* FIXME: msm_pmem_region_lookup return values */

/* FIXME: way too many copy to/from user */
@@ -361,7 +361,7 @@ static int __msm_get_frame(struct msm_sync *sync, 
	if (!frame->buffer) {

		pr_err("%s: cannot get frame, invalid lookup address "

			"y=%x cbcr=%x offset=%d\n",

			__FUNCTION__,

			__func__,

			pphy->y_phy,

			pphy->cbcr_phy,

			frame->y_off);
@@ -592,7 +592,6 @@ static int msm_control(struct msm_control_device *ctrl_pmsm, 
	 * a result of a successful completion, we are freeing the qcmd that

	 * we dequeued from queue->ctrl_status_q.

	 */

	if (qcmd)

	kfree(qcmd);



	CDBG("msm_control: end rc = %d\n", rc);
@@ -670,7 +669,7 @@ static int msm_get_stats(struct msm_sync *sync, void __user *arg) 
					&(stats.fd));

			if (!stats.buffer) {

				pr_err("%s: msm_pmem_stats_ptov_lookup error\n",

					__FUNCTION__);

					__func__);

				rc = -EINVAL;

				goto failure;

			}
@@ -718,8 +717,7 @@ static int msm_get_stats(struct msm_sync *sync, void __user *arg) 
					buf.fmain.buffer =

						(unsigned long)region.vaddr;

					buf.fmain.fd = region.fd;

				}

				else {

				} else {

					pr_err("%s: pmem lookup failed\n",

						__func__);

					rc = -EINVAL;
@@ -796,7 +794,6 @@ static int msm_get_stats(struct msm_sync *sync, void __user *arg) 
	}



failure:

	if (qcmd)

	kfree(qcmd);



	CDBG("msm_get_stats: %d\n", rc);
@@ -838,8 +835,8 @@ static int msm_ctrl_cmd_done(struct msm_control_device *ctrl_pmsm, 
			kfree(qcmd);

			goto end;

		}

	}

	else ctrlcmd->value = NULL;

	} else

		ctrlcmd->value = NULL;



end:

	CDBG("msm_ctrl_cmd_done: end rc = %d\n", rc);
@@ -876,7 +873,7 @@ static int msm_config_vfe(struct msm_sync *sync, void __user *arg) 
					MSM_PMEM_AEC_AWB, &region[0],

					NUM_WB_EXP_STAT_OUTPUT_BUFFERS);

		if (!axi_data.bufnum1) {

			pr_err("%s: pmem region lookup error\n", __FUNCTION__);

			pr_err("%s: pmem region lookup error\n", __func__);

			return -EINVAL;

		}

		axi_data.region = &region[0];
@@ -888,7 +885,7 @@ static int msm_config_vfe(struct msm_sync *sync, void __user *arg) 
					MSM_PMEM_AF, &region[0],

					NUM_AF_STAT_OUTPUT_BUFFERS);

		if (!axi_data.bufnum1) {

			pr_err("%s: pmem region lookup error\n", __FUNCTION__);

			pr_err("%s: pmem region lookup error\n", __func__);

			return -EINVAL;

		}

		axi_data.region = &region[0];
@@ -899,7 +896,7 @@ static int msm_config_vfe(struct msm_sync *sync, void __user *arg) 
		break;

	default:

		pr_err("%s: unknown command type %d\n",

			__FUNCTION__, cfgcmd.cmd_type);

			__func__, cfgcmd.cmd_type);

		return -EINVAL;

	}
@@ -928,7 +925,7 @@ static int msm_frame_axi_cfg(struct msm_sync *sync, 
			msm_pmem_region_lookup(&sync->frame, pmem_type,

				&region[0], 8);

		if (!axi_data.bufnum1) {

			pr_err("%s: pmem region lookup error\n", __FUNCTION__);

			pr_err("%s: pmem region lookup error\n", __func__);

			return -EINVAL;

		}

		break;
@@ -939,7 +936,7 @@ static int msm_frame_axi_cfg(struct msm_sync *sync, 
			msm_pmem_region_lookup(&sync->frame, pmem_type,

				&region[0], 8);

		if (!axi_data.bufnum2) {

			pr_err("%s: pmem region lookup error\n", __FUNCTION__);

			pr_err("%s: pmem region lookup error\n", __func__);

			return -EINVAL;

		}

		break;
@@ -950,7 +947,7 @@ static int msm_frame_axi_cfg(struct msm_sync *sync, 
			msm_pmem_region_lookup(&sync->frame, pmem_type,

				&region[0], 8);

		if (!axi_data.bufnum1) {

			pr_err("%s: pmem region lookup error\n", __FUNCTION__);

			pr_err("%s: pmem region lookup error\n", __func__);

			return -EINVAL;

		}
@@ -959,7 +956,7 @@ static int msm_frame_axi_cfg(struct msm_sync *sync, 
			msm_pmem_region_lookup(&sync->frame, pmem_type,

				&region[axi_data.bufnum1], 8);

		if (!axi_data.bufnum2) {

			pr_err("%s: pmem region lookup error\n", __FUNCTION__);

			pr_err("%s: pmem region lookup error\n", __func__);

			return -EINVAL;

		}

		break;
@@ -970,7 +967,7 @@ static int msm_frame_axi_cfg(struct msm_sync *sync, 
			msm_pmem_region_lookup(&sync->frame, pmem_type,

				&region[0], 8);

		if (!axi_data.bufnum2) {

			pr_err("%s: pmem region lookup error\n", __FUNCTION__);

			pr_err("%s: pmem region lookup error\n", __func__);

			return -EINVAL;

		}

		break;
@@ -981,7 +978,7 @@ static int msm_frame_axi_cfg(struct msm_sync *sync, 


	default:

		pr_err("%s: unknown command type %d\n",

			__FUNCTION__, cfgcmd->cmd_type);

			__func__, cfgcmd->cmd_type);

		return -EINVAL;

	}
@@ -1047,7 +1044,7 @@ static int __msm_put_frame_buf(struct msm_sync *sync, 
			rc = sync->vfefn.vfe_config(&cfgcmd, &pphy);

	} else {

		pr_err("%s: msm_pmem_frame_vtop_lookup failed\n",

			__FUNCTION__);

			__func__);

		rc = -EINVAL;

	}
@@ -1131,7 +1128,7 @@ static int msm_stats_axi_cfg(struct msm_sync *sync, 
		break;

	default:

		pr_err("%s: unknown command type %d\n",

			__FUNCTION__, cfgcmd->cmd_type);

			__func__, cfgcmd->cmd_type);

		return -EINVAL;

	}
@@ -1140,7 +1137,7 @@ static int msm_stats_axi_cfg(struct msm_sync *sync, 
			msm_pmem_region_lookup(&sync->stats, pmem_type,

				&region[0], NUM_WB_EXP_STAT_OUTPUT_BUFFERS);

		if (!axi_data.bufnum1) {

			pr_err("%s: pmem region lookup error\n", __FUNCTION__);

			pr_err("%s: pmem region lookup error\n", __func__);

			return -EINVAL;

		}

		axi_data.region = &region[0];
@@ -1177,7 +1174,7 @@ static int msm_put_stats_buffer(struct msm_sync *sync, void __user *arg) 
			cfgcmd.cmd_type = CMD_STATS_AF_BUF_RELEASE;

		else {

			pr_err("%s: invalid buf type %d\n",

				__FUNCTION__,

				__func__,

				buf.type);

			rc = -EINVAL;

			goto put_done;
@@ -1223,7 +1220,7 @@ static int msm_axi_config(struct msm_sync *sync, void __user *arg) 


	default:

		pr_err("%s: unknown command type %d\n",

			__FUNCTION__,

			__func__,

			cfgcmd.cmd_type);

		return -EINVAL;

	}
@@ -1622,7 +1619,7 @@ static int msm_release_control(struct inode *node, struct file *filep) 
	int rc;

	struct msm_control_device *ctrl_pmsm = filep->private_data;

	struct msm_device *pmsm = ctrl_pmsm->pmsm;

	printk("msm_camera: RELEASE %s\n", filep->f_path.dentry->d_name.name);

	printk(KERN_INFO "msm_camera: RELEASE %s\n", filep->f_path.dentry->d_name.name);

	rc = __msm_release(pmsm->sync);

	if (!rc) {

		MSM_DRAIN_QUEUE(&ctrl_pmsm->ctrl_q, ctrl_status_q);
@@ -1636,7 +1633,7 @@ static int msm_release_frame(struct inode *node, struct file *filep) 
{

	int rc;

	struct msm_device *pmsm = filep->private_data;

	printk("msm_camera: RELEASE %s\n", filep->f_path.dentry->d_name.name);

	printk(KERN_INFO "msm_camera: RELEASE %s\n", filep->f_path.dentry->d_name.name);

	rc = __msm_release(pmsm->sync);

	if (!rc) {

		MSM_DRAIN_QUEUE(pmsm->sync, prev_frame_q);
@@ -1931,7 +1928,7 @@ static int __msm_v4l2_control(struct msm_sync *sync, 
	memcpy(out->value, ctrl->value, ctrl->length);



end:

	if (rcmd) kfree(rcmd);

	kfree(rcmd);

	CDBG("__msm_v4l2_control: end rc = %d\n", rc);

	return rc;

}