From patchwork Mon Jan 19 13:22:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 43307 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f72.google.com (mail-wg0-f72.google.com [74.125.82.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id AA49B2410B for ; Mon, 19 Jan 2015 13:23:12 +0000 (UTC) Received: by mail-wg0-f72.google.com with SMTP id l18sf3199189wgh.3 for ; Mon, 19 Jan 2015 05:23:11 -0800 (PST) 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=lCdNDZvx0E3mFwEkyg1k9Pv3WIzf5e5iih47siegG4Q=; b=bfmrmshyN4PeO8Bvp5ez4NuqeR1cMyAGBwlr0EUCS2A5Oi/iYp3dE3kDg581UENdE4 m4QUImfg4SPZr+ONu+7XnZOpqtdgTMj/5+SUbVRSvuRqQ5xtE3NZdKidVk5NPK3escjt Uusn671zwO9ZuQkDXJfS73xu2pdz1KrZ4zPB0ZRzL4k0ZSRad7jqtNykFUicXtIL+WAY BgpBsd7PYuPB/X8xFWCM5hZc7VTkn9Cx511FeRT78WLJQWIxksvhuSBt0+oBh0F6H9vi vpM7xfCxXVA+6X6m40Ils5kFntXOBbtDHVrvHQvbZabFkXTZeRgeX6Fy5hEhvqAeq17Y Fqog== X-Gm-Message-State: ALoCoQlgz7xVUaVvAX528KSz20MzRFxLZu2Q9EPc3ihn0Iaj0m27T9QeWrKvpaZwCbmBuy29d6K1 X-Received: by 10.112.161.201 with SMTP id xu9mr294156lbb.11.1421673791788; Mon, 19 Jan 2015 05:23:11 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.228.135 with SMTP id si7ls585604lac.51.gmail; Mon, 19 Jan 2015 05:23:11 -0800 (PST) X-Received: by 10.152.206.41 with SMTP id ll9mr31198559lac.62.1421673791581; Mon, 19 Jan 2015 05:23:11 -0800 (PST) Received: from mail-la0-f53.google.com (mail-la0-f53.google.com. [209.85.215.53]) by mx.google.com with ESMTPS id v3si12916475lal.96.2015.01.19.05.23.09 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 19 Jan 2015 05:23:09 -0800 (PST) Received-SPF: temperror (google.com: error in processing during lookup of patch+caf_=patchwork-forward=linaro.org@linaro.org: DNS timeout) client-ip=209.85.215.53; Received: by mail-la0-f53.google.com with SMTP id gq15so4346897lab.12 for ; Mon, 19 Jan 2015 05:23:09 -0800 (PST) X-Received: by 10.112.98.99 with SMTP id eh3mr30481101lbb.32.1421673788148; Mon, 19 Jan 2015 05:23:08 -0800 (PST) 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.9.200 with SMTP id c8csp1089748lbb; Mon, 19 Jan 2015 05:23:07 -0800 (PST) X-Received: by 10.113.11.12 with SMTP id ee12mr30747949lbd.79.1421673784318; Mon, 19 Jan 2015 05:23:04 -0800 (PST) Received: from mail-lb0-f179.google.com (mail-lb0-f179.google.com. [209.85.217.179]) by mx.google.com with ESMTPS id u8si12929094lag.83.2015.01.19.05.23.02 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 19 Jan 2015 05:23:02 -0800 (PST) Received-SPF: temperror (google.com: error in processing during lookup of ulf.hansson@linaro.org: DNS timeout) client-ip=209.85.217.179; Received: by mail-lb0-f179.google.com with SMTP id z11so28166661lbi.10 for ; Mon, 19 Jan 2015 05:22:59 -0800 (PST) X-Received: by 10.112.164.102 with SMTP id yp6mr30262911lbb.15.1421673777551; Mon, 19 Jan 2015 05:22:57 -0800 (PST) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id v4sm3080344lbz.12.2015.01.19.05.22.55 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 19 Jan 2015 05:22:56 -0800 (PST) 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, Kukjin Kim , Sylwester Nawrocki , Kyungmin Park , Ulf Hansson Subject: [PATCH V2 2/8] [media] exynos-gsc: Convert gsc_m2m_resume() from int to void Date: Mon, 19 Jan 2015 14:22:34 +0100 Message-Id: <1421673760-2600-3-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1421673760-2600-1-git-send-email-ulf.hansson@linaro.org> References: <1421673760-2600-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=temperror (google.com: error in processing during lookup of patch+caf_=patchwork-forward=linaro.org@linaro.org: DNS timeout) 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 to a 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 bd769d4..1865738 100644 --- a/drivers/media/platform/exynos-gsc/gsc-core.c +++ b/drivers/media/platform/exynos-gsc/gsc-core.c @@ -1025,7 +1025,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; @@ -1038,8 +1038,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) @@ -1168,8 +1166,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)