From: ulf.hansson@linaro.org (Ulf Hansson)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/7] [media] exynos-gsc: Convert gsc_m2m_resume() from int to void
Date: Tue, 14 Oct 2014 09:15:35 +0200 [thread overview]
Message-ID: <1413270940-4378-3-git-send-email-ulf.hansson@linaro.org> (raw)
In-Reply-To: <1413270940-4378-1-git-send-email-ulf.hansson@linaro.org>
Since gsc_m2m_resume() always returns 0, convert it into void instead.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
---
drivers/media/platform/exynos-gsc/gsc-core.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/media/platform/exynos-gsc/gsc-core.c b/drivers/media/platform/exynos-gsc/gsc-core.c
index 3fca4fd..13d0226 100644
--- a/drivers/media/platform/exynos-gsc/gsc-core.c
+++ b/drivers/media/platform/exynos-gsc/gsc-core.c
@@ -1022,7 +1022,7 @@ static int gsc_m2m_suspend(struct gsc_dev *gsc)
return timeout == 0 ? -EAGAIN : 0;
}
-static int gsc_m2m_resume(struct gsc_dev *gsc)
+static void gsc_m2m_resume(struct gsc_dev *gsc)
{
struct gsc_ctx *ctx;
unsigned long flags;
@@ -1035,8 +1035,6 @@ static int gsc_m2m_resume(struct gsc_dev *gsc)
if (test_and_clear_bit(ST_M2M_SUSPENDED, &gsc->state))
gsc_m2m_job_finish(ctx, VB2_BUF_STATE_ERROR);
-
- return 0;
}
static int gsc_probe(struct platform_device *pdev)
@@ -1165,8 +1163,9 @@ static int gsc_runtime_resume(struct device *dev)
gsc_hw_set_sw_reset(gsc);
gsc_wait_reset(gsc);
+ gsc_m2m_resume(gsc);
- return gsc_m2m_resume(gsc);
+ return 0;
}
static int gsc_runtime_suspend(struct device *dev)
--
1.9.1
next prev parent reply other threads:[~2014-10-14 7:15 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-14 7:15 [PATCH 0/7] [media] exynos-gsc: Fixup PM support Ulf Hansson
2014-10-14 7:15 ` [PATCH 1/7] [media] exynos-gsc: Simplify clock management Ulf Hansson
2014-10-14 7:15 ` Ulf Hansson [this message]
2014-10-14 7:15 ` [PATCH 3/7] [media] exynos-gsc: Make driver functional without CONFIG_PM_RUNTIME Ulf Hansson
2014-10-14 7:15 ` [PATCH 4/7] [media] exynos-gsc: Make runtime PM callbacks available for CONFIG_PM Ulf Hansson
2014-10-14 7:15 ` [PATCH 5/7] [media] exynos-gsc: Fixup system PM Ulf Hansson
2014-10-14 7:15 ` [PATCH 6/7] [media] exynos-gsc: Fixup clock management at ->remove() Ulf Hansson
2014-10-14 7:15 ` [PATCH 7/7] [media] exynos-gsc: Do full clock gating at runtime PM suspend Ulf Hansson
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=1413270940-4378-3-git-send-email-ulf.hansson@linaro.org \
--to=ulf.hansson@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/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;
as well as URLs for NNTP newsgroup(s).