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: 5078431 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 5B997C11AC for ; Tue, 14 Oct 2014 07:16:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8952520148 for ; Tue, 14 Oct 2014 07:16:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AC70B20142 for ; Tue, 14 Oct 2014 07:16:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754112AbaJNHQB (ORCPT ); Tue, 14 Oct 2014 03:16:01 -0400 Received: from mail-la0-f41.google.com ([209.85.215.41]:51261 "EHLO mail-la0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754163AbaJNHP6 (ORCPT ); Tue, 14 Oct 2014 03:15:58 -0400 Received: by mail-la0-f41.google.com with SMTP id pn19so7989827lab.14 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=cxD7+VMeRtLx6ruFnk+aAC2mxF7jHKKcuKtOI2YPfm62ldFARKRfUQlNIjWGBtAwsP fE8XKRWUSV/mnTGZjs+vADl1mHfoi7D90zRZsjguz4M3vyvGAXknjdkuR4uAL5zQ8G3v REGtIxMe0MaZApROQ5sD/TVo+EJ/x29mvLgEyW3F4LmLRMaVyJUh6U6+Q1SmReSkNRVE fmd1LNGhVbCXJlypDGT23PvonuPtJCs5rocWNSCWsA/8cbpNqZsHh0cicHrPL1+yvtx0 Qa/P2sWLr9XmTeH+ZY5y/KPszKYignfkqVu8S/GbnXcHpHdEfLi0W4mQIS8KwHUFzN9P ptGw== X-Gm-Message-State: ALoCoQmuZOU41McoTiiB8CauYgVV5mNcZQYaK/+c7TM6VRSHxzs6fNybhkYJ5UKpa9NXUG2s69CM 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> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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)