renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-15 00:54:03 +08:00
Code

staging: media: atomisp: compress return logic

Browse Source 
Simplify function returns by merging assignment and return.

Signed-off-by: Arushi Singhal <arushisinghal19971997@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Arushi Singhal 2017-03-28 21:38:15 +05:30 committed by Greg Kroah-Hartman
parent 478f4f406e
commit f6260f2e49
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c
View File

@ -519,9 +519,7 @@ int atomisp_runtime_suspend(struct device *dev)
if (ret)
return ret;
pm_qos_update_request(&isp->pm_qos, PM_QOS_DEFAULT_VALUE);
ret = atomisp_mrfld_power_down(isp);
return ret;
return atomisp_mrfld_power_down(isp);
}
int atomisp_runtime_resume(struct device *dev)
@ -587,9 +585,7 @@ static int atomisp_suspend(struct device *dev)
return ret;
}
pm_qos_update_request(&isp->pm_qos, PM_QOS_DEFAULT_VALUE);
ret = atomisp_mrfld_power_down(isp);
return ret;
return atomisp_mrfld_power_down(isp);
}
static int atomisp_resume(struct device *dev)

10
drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/bufq/src/bufq.c
View File

@ -440,7 +440,7 @@ enum ia_css_err ia_css_bufq_enqueue_psys_event(
enum ia_css_err ia_css_bufq_dequeue_psys_event(
uint8_t item[BUFQ_EVENT_SIZE])
{
enum ia_css_err return_err;
enum ia_css_err;
int error = 0;
ia_css_queue_t *q;
@ -457,8 +457,7 @@ enum ia_css_err ia_css_bufq_dequeue_psys_event(
}
error = ia_css_eventq_recv(q, item);
return_err = ia_css_convert_errno(error);
return return_err;
return ia_css_convert_errno(error);
}
@ -466,7 +465,7 @@ enum ia_css_err ia_css_bufq_dequeue_isys_event(
uint8_t item[BUFQ_EVENT_SIZE])
{
#if !defined(HAS_NO_INPUT_SYSTEM)
enum ia_css_err return_err;
enum ia_css_err;
int error = 0;
ia_css_queue_t *q;
@ -482,8 +481,7 @@ enum ia_css_err ia_css_bufq_dequeue_isys_event(
return IA_CSS_ERR_RESOURCE_NOT_AVAILABLE;
}
error = ia_css_eventq_recv(q, item);
return_err = ia_css_convert_errno(error);
return return_err;
return ia_css_convert_errno(error);
#else
(void)item;
return IA_CSS_ERR_RESOURCE_NOT_AVAILABLE;