From: Arushi Singhal <arushisinghal19971997@gmail.com>
To: mchehab@kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-media@vger.kernel.org, devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org, outreachy-kernel@googlegroups.com
Subject: [PATCH] staging: media: atomisp: compress return logic
Date: Sat, 25 Mar 2017 11:30:07 +0530 [thread overview]
Message-ID: <20170325060007.GA5497@arushi-HP-Pavilion-Notebook> (raw)
Simplify function returns by merging assignment and return.
Signed-off-by: Arushi Singhal <arushisinghal19971997@gmail.com>
---
drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c | 8 ++------
.../media/atomisp/pci/atomisp2/css2400/runtime/bufq/src/bufq.c | 7 ++-----
2 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c
index b1f685a841ba..a04cd3ba7e68 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c
@@ -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)
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/bufq/src/bufq.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/bufq/src/bufq.c
index 737ad66da900..10418c190f93 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/bufq/src/bufq.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/bufq/src/bufq.c
@@ -440,7 +440,6 @@ 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;
int error = 0;
ia_css_queue_t *q;
@@ -457,8 +456,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);
}
@@ -482,8 +480,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;
--
2.11.0
next reply other threads:[~2017-03-25 6:00 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-25 6:00 Arushi Singhal [this message]
2017-03-27 2:25 ` kbuild test robot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170325060007.GA5497@arushi-HP-Pavilion-Notebook \
--to=arushisinghal19971997@gmail.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=outreachy-kernel@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®