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: 38688 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f197.google.com (mail-wi0-f197.google.com [209.85.212.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 45B8220549 for ; Tue, 14 Oct 2014 07:16:00 +0000 (UTC) Received: by mail-wi0-f197.google.com with SMTP id n3sf3605455wiv.0 for ; Tue, 14 Oct 2014 00:15:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=8pOiukPAt0kmjAM5x4mLKsWvkRgYRC13YFiMQEHvg+0=; b=ComxjZ74yP7f2EfxMMvNNa0KVPBDAB8ruZtx+zzaHGD2C3czVslsgqSnZeAao9EQ9Z 1qbx4VoRho8A9Pcxx9NfxAv9tSaVmmteSLdoYRQR/+10ckjWV7AmRaClr4DiN74FSUH3 NaZLwHRp7CEfWeGG3YtoI+Y4wDDi0V884FA9IosK8sdWOoPd+3Rwys7kU/8chQ1XxoyD l67Adwq50gLfxQsPTcU8/4w9H65QGpaMiBB8dc/wiGOL41ajDTXnM3bJGHjqJkBnwTUp pXrY/5FAn2hT4b4p15sMgLkVBnUqydmG1CRdmH+ZmTr0Utpt3nYAk/DuO9pJiQgK8nkg 5w9w== X-Gm-Message-State: ALoCoQm3ttpYFPKBkHhbrZnINYWUoOijifBHCO2YPo2wmPFsdzyW2adFxDDZeBao8HKWv6wbEL1m X-Received: by 10.112.217.102 with SMTP id ox6mr72766lbc.19.1413270959451; Tue, 14 Oct 2014 00:15:59 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.206.72 with SMTP id lm8ls546373lac.9.gmail; Tue, 14 Oct 2014 00:15:59 -0700 (PDT) X-Received: by 10.152.87.98 with SMTP id w2mr3274647laz.27.1413270959319; Tue, 14 Oct 2014 00:15:59 -0700 (PDT) Received: from mail-la0-f54.google.com (mail-la0-f54.google.com [209.85.215.54]) by mx.google.com with ESMTPS id lb6si13590053lac.111.2014.10.14.00.15.59 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 14 Oct 2014 00:15:59 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.54 as permitted sender) client-ip=209.85.215.54; Received: by mail-la0-f54.google.com with SMTP id gm9so7988947lab.27 for ; Tue, 14 Oct 2014 00:15:59 -0700 (PDT) X-Received: by 10.112.122.78 with SMTP id lq14mr3374672lbb.80.1413270958969; Tue, 14 Oct 2014 00:15:58 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.112.84.229 with SMTP id c5csp345534lbz; Tue, 14 Oct 2014 00:15:58 -0700 (PDT) X-Received: by 10.152.21.226 with SMTP id y2mr3422909lae.70.1413270957462; Tue, 14 Oct 2014 00:15:57 -0700 (PDT) Received: from mail-la0-f43.google.com (mail-la0-f43.google.com [209.85.215.43]) by mx.google.com with ESMTPS id lc6si25102773lbb.129.2014.10.14.00.15.57 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 14 Oct 2014 00:15:57 -0700 (PDT) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.215.43 as permitted sender) client-ip=209.85.215.43; Received: by mail-la0-f43.google.com with SMTP id mc6so7920325lab.2 for ; Tue, 14 Oct 2014 00:15:57 -0700 (PDT) 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 Cc: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-pm@vger.kernel.org, Geert Uytterhoeven , Kevin Hilman , Tomasz Figa , Kukjin Kim , Philipp Zabel , Sylwester Nawrocki , "Rafael J. Wysocki" , Pavel Machek , Ulf Hansson 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-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ulf.hansson@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.54 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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)