Staging: dream: camera: msm_camera: fix code style issues
This fixes some code style issues like to add one space after a while or switch statement and before a open parenthesis '(', and to include KERN_ facility level in the printk() functions. Signed-off-by: Chihau Chau <chihau@gmail.com> Acked-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Родитель
3f4b4e7797
Коммит
df84f941e9
|
@ -76,14 +76,14 @@ static LIST_HEAD(msm_sensors);
|
||||||
list_del_init(&qcmd->list); \
|
list_del_init(&qcmd->list); \
|
||||||
kfree(qcmd); \
|
kfree(qcmd); \
|
||||||
}; \
|
}; \
|
||||||
} while(0)
|
} while (0)
|
||||||
|
|
||||||
#define MSM_DRAIN_QUEUE(sync, name) do { \
|
#define MSM_DRAIN_QUEUE(sync, name) do { \
|
||||||
unsigned long flags; \
|
unsigned long flags; \
|
||||||
spin_lock_irqsave(&(sync)->name##_lock, flags); \
|
spin_lock_irqsave(&(sync)->name##_lock, flags); \
|
||||||
MSM_DRAIN_QUEUE_NOSYNC(sync, name); \
|
MSM_DRAIN_QUEUE_NOSYNC(sync, name); \
|
||||||
spin_unlock_irqrestore(&(sync)->name##_lock, flags); \
|
spin_unlock_irqrestore(&(sync)->name##_lock, flags); \
|
||||||
} while(0)
|
} while (0)
|
||||||
|
|
||||||
static int check_overlap(struct hlist_head *ptype,
|
static int check_overlap(struct hlist_head *ptype,
|
||||||
unsigned long paddr,
|
unsigned long paddr,
|
||||||
|
@ -868,7 +868,7 @@ static int msm_config_vfe(struct msm_sync *sync, void __user *arg)
|
||||||
return -EFAULT;
|
return -EFAULT;
|
||||||
}
|
}
|
||||||
|
|
||||||
switch(cfgcmd.cmd_type) {
|
switch (cfgcmd.cmd_type) {
|
||||||
case CMD_STATS_ENABLE:
|
case CMD_STATS_ENABLE:
|
||||||
axi_data.bufnum1 =
|
axi_data.bufnum1 =
|
||||||
msm_pmem_region_lookup(&sync->stats,
|
msm_pmem_region_lookup(&sync->stats,
|
||||||
|
@ -1621,7 +1621,8 @@ static int msm_release_control(struct inode *node, struct file *filep)
|
||||||
int rc;
|
int rc;
|
||||||
struct msm_control_device *ctrl_pmsm = filep->private_data;
|
struct msm_control_device *ctrl_pmsm = filep->private_data;
|
||||||
struct msm_device *pmsm = ctrl_pmsm->pmsm;
|
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);
|
rc = __msm_release(pmsm->sync);
|
||||||
if (!rc) {
|
if (!rc) {
|
||||||
MSM_DRAIN_QUEUE(&ctrl_pmsm->ctrl_q, ctrl_status_q);
|
MSM_DRAIN_QUEUE(&ctrl_pmsm->ctrl_q, ctrl_status_q);
|
||||||
|
@ -1635,7 +1636,8 @@ static int msm_release_frame(struct inode *node, struct file *filep)
|
||||||
{
|
{
|
||||||
int rc;
|
int rc;
|
||||||
struct msm_device *pmsm = filep->private_data;
|
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);
|
rc = __msm_release(pmsm->sync);
|
||||||
if (!rc) {
|
if (!rc) {
|
||||||
MSM_DRAIN_QUEUE(pmsm->sync, prev_frame_q);
|
MSM_DRAIN_QUEUE(pmsm->sync, prev_frame_q);
|
||||||
|
@ -1719,7 +1721,7 @@ static void msm_vfe_sync(struct msm_vfe_resp *vdata,
|
||||||
qcmd->type = qtype;
|
qcmd->type = qtype;
|
||||||
|
|
||||||
if (qtype == MSM_CAM_Q_VFE_MSG) {
|
if (qtype == MSM_CAM_Q_VFE_MSG) {
|
||||||
switch(vdata->type) {
|
switch (vdata->type) {
|
||||||
case VFE_MSG_OUTPUT1:
|
case VFE_MSG_OUTPUT1:
|
||||||
case VFE_MSG_OUTPUT2:
|
case VFE_MSG_OUTPUT2:
|
||||||
qcmd_frame =
|
qcmd_frame =
|
||||||
|
@ -1928,7 +1930,8 @@ static int __msm_v4l2_control(struct msm_sync *sync,
|
||||||
memcpy(out->value, ctrl->value, ctrl->length);
|
memcpy(out->value, ctrl->value, ctrl->length);
|
||||||
|
|
||||||
end:
|
end:
|
||||||
if (rcmd) kfree(rcmd);
|
if (rcmd)
|
||||||
|
kfree(rcmd);
|
||||||
CDBG("__msm_v4l2_control: end rc = %d\n", rc);
|
CDBG("__msm_v4l2_control: end rc = %d\n", rc);
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче