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: 5658731 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id CC4789F333 for ; Mon, 19 Jan 2015 13:23:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1AF7820035 for ; Mon, 19 Jan 2015 13:23:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 734CB20386 for ; Mon, 19 Jan 2015 13:23:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752051AbbASNXB (ORCPT ); Mon, 19 Jan 2015 08:23:01 -0500 Received: from mail-la0-f46.google.com ([209.85.215.46]:33910 "EHLO mail-la0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751963AbbASNXA (ORCPT ); Mon, 19 Jan 2015 08:23:00 -0500 Received: by mail-la0-f46.google.com with SMTP id s18so7851917lam.5 for ; Mon, 19 Jan 2015 05:22:59 -0800 (PST) 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=lCdNDZvx0E3mFwEkyg1k9Pv3WIzf5e5iih47siegG4Q=; b=LOdXRl11jaKHy9lCRh16PsztKUVIvRNgE/f1i6OgYzuJJSfFUVfwBv/kg/bnUJmKAz D5YunVmQ/A7RD6zMn01Rz0UilPF955O+xo98dfPZ44/h5QNNkis69cQlW5idhcm/Qhrs Na+P/yTOeIecILgWuH43RCvTJ1BoCazwi7xUca12DNjH8dnStGtm47Uh2oVQP7Yiz7lb 4VfyXo10fhO4PJnuqJJT6glRzfs5Fi/HI+JC6tXIrqCfEYC1YRrDdgVkfmxV6Paxrijf D6oN8bi+7aziZ09Z23/LHqwpOVGaugso6XhGds1Dug78DQ+hWDapCCRJHHkJdvR+QK2O B75Q== X-Gm-Message-State: ALoCoQndePQ40EJkP8vKMeN8tj/ncZhgvw/GVryUmyi2r0QSWtE8p1jKWdqpWxzIFCurM5Ii9F+o 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> 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=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 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)