From patchwork Tue Oct 14 07:15:35 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 5078611 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9F35B9F349 for ; Tue, 14 Oct 2014 07:19:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D2BE620148 for ; Tue, 14 Oct 2014 07:19:17 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F332120142 for ; Tue, 14 Oct 2014 07:19:16 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XdwLP-00086E-Pt; Tue, 14 Oct 2014 07:16:31 +0000 Received: from mail-lb0-f181.google.com ([209.85.217.181]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XdwLE-0007qo-BL for linux-arm-kernel@lists.infradead.org; Tue, 14 Oct 2014 07:16:21 +0000 Received: by mail-lb0-f181.google.com with SMTP id l4so7548746lbv.26 for ; Tue, 14 Oct 2014 00:15:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=8pOiukPAt0kmjAM5x4mLKsWvkRgYRC13YFiMQEHvg+0=; b=GfLIcnADhhZMQEyapQ5VZ4D6akNuDUbmn2V3k9/D+kza27qe8x3j7nvQaTCB1/tinl AHSuGT84N4D+adf5ccKy6fwCTGLsYIxloLXZ4ht0W/weL5b/Z8VpsSs4r2cOWRD024a2 iRzkTpvNFV3Y9JvzW15nK1dv8D67sL4jIlCqa1Ttr1M8R1yU+ZJng6AO4iJlFpCOBXYU up538D4Q1pSnwQf0dmNuLZWTd2rMTucH7bDSPXaWo1QzxJ2ImXRKgHi8LYlEOP79Ucnp kC60SdAGcYRr/1rSLDjBjwOwF15+7ZOFInoFP9M9x4f7AdPzAuE15sOQySDvztKz4dqn t3SA== X-Gm-Message-State: ALoCoQmIeyjLF0qOeaS7Jzm3UMWaaPwAGiafe0cWi9pk9bGcX8I/EFo4z/4GNjnHvTDt8HTf9+xf X-Received: by 10.112.182.1 with SMTP id ea1mr3430053lbc.16.1413270957335; Tue, 14 Oct 2014 00:15:57 -0700 (PDT) Received: from uffe-Latitude-E6430s.lan (90-231-160-185-no158.tbcn.telia.com. [90.231.160.185]) by mx.google.com with ESMTPSA id a2sm5279497lbs.21.2014.10.14.00.15.55 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 14 Oct 2014 00:15:56 -0700 (PDT) From: Ulf Hansson To: Mauro Carvalho Chehab , linux-media@vger.kernel.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 Message-Id: <1413270940-4378-3-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1413270940-4378-1-git-send-email-ulf.hansson@linaro.org> References: <1413270940-4378-1-git-send-email-ulf.hansson@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141014_001620_630126_D7370B01 X-CRM114-Status: GOOD ( 10.85 ) X-Spam-Score: -0.7 (/) Cc: Ulf Hansson , Kevin Hilman , Sylwester Nawrocki , Geert Uytterhoeven , linux-pm@vger.kernel.org, Pavel Machek , "Rafael J. Wysocki" , Tomasz Figa , linux-samsung-soc@vger.kernel.org, Philipp Zabel , Kukjin Kim , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Since gsc_m2m_resume() always returns 0, convert it into void instead. Signed-off-by: Ulf Hansson --- 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)