From patchwork Wed Nov 9 14:23:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 81493 Delivered-To: patch@linaro.org Received: by 10.140.97.165 with SMTP id m34csp223036qge; Wed, 9 Nov 2016 06:24:22 -0800 (PST) X-Received: by 10.98.100.66 with SMTP id y63mr34062523pfb.49.1478701462447; Wed, 09 Nov 2016 06:24:22 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k16si27136951pag.60.2016.11.09.06.24.22; Wed, 09 Nov 2016 06:24:22 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-samsung-soc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-samsung-soc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-samsung-soc-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754106AbcKIOYT (ORCPT + 4 others); Wed, 9 Nov 2016 09:24:19 -0500 Received: from mailout3.w1.samsung.com ([210.118.77.13]:60632 "EHLO mailout3.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753525AbcKIOYN (ORCPT ); Wed, 9 Nov 2016 09:24:13 -0500 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout3.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OGD0025NPC9HA50@mailout3.w1.samsung.com>; Wed, 09 Nov 2016 14:24:09 +0000 (GMT) Received: from eusmges1.samsung.com (unknown [203.254.199.239]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20161109142408eucas1p15a40dd5c8183441567536d94183cd1f7~FZyISuDIb1372813728eucas1p1r; Wed, 9 Nov 2016 14:24:08 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges1.samsung.com (EUCPMTA) with SMTP id 71.F7.23383.98133285; Wed, 9 Nov 2016 14:24:09 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20161109142407eucas1p11730c21fb7320ba3271665afe92d2a1c~FZyHYiM4U1373513735eucas1p16; Wed, 9 Nov 2016 14:24:07 +0000 (GMT) X-AuditID: cbfec7ef-f79e76d000005b57-fe-58233189e248 Received: from eusync2.samsung.com ( [203.254.199.212]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 03.AE.07726.78133285; Wed, 9 Nov 2016 14:24:07 +0000 (GMT) Received: from AMDC2765.digital.local ([106.116.147.25]) by eusync2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0OGD009LGPC36HB0@eusync2.samsung.com>; Wed, 09 Nov 2016 14:24:07 +0000 (GMT) From: Marek Szyprowski To: linux-media@vger.kernel.org, linux-samsung-soc@vger.kernel.org Cc: Marek Szyprowski , Sylwester Nawrocki , Krzysztof Kozlowski , Ulf Hansson , Bartlomiej Zolnierkiewicz , Javier Martinez Canillas Subject: [PATCH 02/12] exynos-gsc: Convert gsc_m2m_resume() from int to void Date: Wed, 09 Nov 2016 15:23:51 +0100 Message-id: <1478701441-29107-3-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1478701441-29107-1-git-send-email-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrDIsWRmVeSWpSXmKPExsWy7djP87qdhsoRBpt6ZSw2zljPavHm7Rom i/PnN7Bb9GzYymox4/w+Jou1R+6yWxx+085qcXxtuAOHx6ZVnWwed67tYfPY0n+X3aNvyypG j8+b5AJYo7hsUlJzMstSi/TtErgyfi9vYi7o567Y0bWDvYFxA2cXIyeHhICJxL2P39kgbDGJ C/fWg9lCAssYJZoeyXUxcgHZnxklGlfMZ4JpaNj5iAUiAVT09u0OZoiOBiaJrgYHEJtNwFCi 620X2CQRASeJhbP+soM0MAvMYpKYOHEfC0hCWMBHonP9djCbRUBV4v/ydYwgNq+Ah8S0s0/Y IbbJSZw8NpkVxOYU8JRYdeQmK8ggCYHPbBI/Pk8HOokDyJGV2HSAGaLeRWLZ2htQtrDEq+Nb oObISHR2HIT6oB/otVZtCHsGo8S5t7wQtrXE4eMXwXYxC/BJTNo2nRliPK9ER5sQRImHxJze g1DjHSV27pzKBgmIOYwSR+a2MU5glFnAyLCKUSS1tDg3PbXYUK84Mbe4NC9dLzk/dxMjMI5P /zv+fgfj0+aQQ4wCHIxKPLwdmsoRQqyJZcWVuYcYJTiYlUR4ZxoAhXhTEiurUovy44tKc1KL DzFKc7AoifPuXXAlXEggPbEkNTs1tSC1CCbLxMEp1cDYEbcqQvg1JwvvPOakty8v2lmaOr18 7jl14kThvp13OKPOL9fJFJj2aYNG6DuPtXOeMR/J49oizbVE6cyjZa9P2HVxfdOxPCX0J/uy yN+lKnY/drZE+CZY12Wd/DXpo8Sa7NlVHv3vPi7/rRTa9NNQ4Lcfz0f+VT8/nFRh2SziZpdR FmWf1nlRiaU4I9FQi7moOBEAT6qFXt8CAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrLLMWRmVeSWpSXmKPExsVy+t/xK7rthsoRBgdm61tsnLGe1eLN2zVM FufPb2C36NmwldVixvl9TBZrj9xltzj8pp3V4vjacAcOj02rOtk87lzbw+axpf8uu0ffllWM Hp83yQWwRrnZZKQmpqQWKaTmJeenZOal2yqFhrjpWigp5CXmptoqRej6hgQpKZQl5pQCeUYG aMDBOcA9WEnfLsEt4/fyJuaCfu6KHV072BsYN3B2MXJySAiYSDTsfMQCYYtJXLi3ng3EFhJY wihxZUVdFyMXkN3EJHGjdTs7SIJNwFCi620XWJGIgJPEwll/2UGKmAVmMUlM7lsCNklYwEei c/12MJtFQFXi//J1jCA2r4CHxLSzT9ghtslJnDw2mRXE5hTwlFh15CYrxGYPia3LZzFOYORd wMiwilEktbQ4Nz232FCvODG3uDQvXS85P3cTIzCotx37uXkH46WNwYcYBTgYlXh4OzSVI4RY E8uKK3MPMUpwMCuJ8M40AArxpiRWVqUW5ccXleakFh9iNAU6aiKzlGhyPjDi8kriDU0MzS0N jYwtLMyNjJTEeUs+XAkXEkhPLEnNTk0tSC2C6WPi4JRqYExYZ20VrcyXcWbfHCNfvdSqMFdx nXkfjh6LV2prYC34uSZ2ZcvS06svst5cp9Ba8FFONdw0zufr4yqD7IjXGV15fy3V1X4Jzf7v XnKF/1S36ElTWVsTyxfJt3mOHd3WdsF+m8wj+Wf6n/ZsaqiM8/+/9XPSbAmXazlrkgTXHd/x q+vxX/EJLEosxRmJhlrMRcWJAKmNLBiAAgAA X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20161109142407eucas1p11730c21fb7320ba3271665afe92d2a1c X-Msg-Generator: CA X-Sender-IP: 182.198.249.179 X-Local-Sender: =?UTF-8?B?TWFyZWsgU3p5cHJvd3NraRtTUlBPTC1LZXJuZWwgKFRQKRs=?= =?UTF-8?B?7IK87ISx7KCE7J6QG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Global-Sender: =?UTF-8?B?TWFyZWsgU3p5cHJvd3NraRtTUlBPTC1LZXJuZWwgKFRQKRtT?= =?UTF-8?B?YW1zdW5nIEVsZWN0cm9uaWNzG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Sender-Code: =?UTF-8?B?QzEwG0VIURtDMTBDRDAyQ0QwMjczOTI=?= CMS-TYPE: 201P X-HopCount: 7 X-CMS-RootMailID: 20161109142407eucas1p11730c21fb7320ba3271665afe92d2a1c X-RootMTR: 20161109142407eucas1p11730c21fb7320ba3271665afe92d2a1c References: <1478701441-29107-1-git-send-email-m.szyprowski@samsung.com> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org From: Ulf Hansson Since gsc_m2m_resume() always returns 0, convert it to a void instead. Signed-off-by: Ulf Hansson [mszyprow: rebased onto v4.9-rc4] Signed-off-by: Marek Szyprowski --- drivers/media/platform/exynos-gsc/gsc-core.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/media/platform/exynos-gsc/gsc-core.c b/drivers/media/platform/exynos-gsc/gsc-core.c index abebbdb..cb4e8bd 100644 --- a/drivers/media/platform/exynos-gsc/gsc-core.c +++ b/drivers/media/platform/exynos-gsc/gsc-core.c @@ -1010,7 +1010,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; @@ -1023,8 +1023,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) @@ -1146,8 +1144,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)