From patchwork Sun Apr 3 23:51:09 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pawel Osciak X-Patchwork-Id: 684441 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p33NpnTW022216 for ; Sun, 3 Apr 2011 23:51:56 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753008Ab1DCXvg (ORCPT ); Sun, 3 Apr 2011 19:51:36 -0400 Received: from mail-iy0-f174.google.com ([209.85.210.174]:62653 "EHLO mail-iy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753003Ab1DCXv2 (ORCPT ); Sun, 3 Apr 2011 19:51:28 -0400 Received: by iyb14 with SMTP id 14so5394290iyb.19 for ; Sun, 03 Apr 2011 16:51:28 -0700 (PDT) Received: by 10.43.54.210 with SMTP id vv18mr2645006icb.103.1301874688325; Sun, 03 Apr 2011 16:51:28 -0700 (PDT) Received: from localhost.localdomain (c-24-4-33-58.hsd1.ca.comcast.net [24.4.33.58]) by mx.google.com with ESMTPS id 19sm3318091ibx.52.2011.04.03.16.51.26 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 03 Apr 2011 16:51:27 -0700 (PDT) From: Pawel Osciak To: linux-media@vger.kernel.org Cc: m.szyprowski@samsung.com, s.nawrocki@samsung.com, g.liakhovetski@gmx.de, Pawel Osciak Subject: [PATCH 4/5] [media] sh_mobile_ceu_camera: remove stop_streaming() callback return Date: Sun, 3 Apr 2011 16:51:09 -0700 Message-Id: <1301874670-14833-5-git-send-email-pawel@osciak.com> X-Mailer: git-send-email 1.7.4.2 In-Reply-To: <1301874670-14833-1-git-send-email-pawel@osciak.com> References: <1301874670-14833-1-git-send-email-pawel@osciak.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Sun, 03 Apr 2011 23:51:57 +0000 (UTC) The stop_streaming() callback does not return a value anymore. Signed-off-by: Pawel Osciak --- drivers/media/video/sh_mobile_ceu_camera.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/video/sh_mobile_ceu_camera.c b/drivers/media/video/sh_mobile_ceu_camera.c index 3fb8f4c..28df50d 100644 --- a/drivers/media/video/sh_mobile_ceu_camera.c +++ b/drivers/media/video/sh_mobile_ceu_camera.c @@ -427,7 +427,7 @@ static int sh_mobile_ceu_videobuf_init(struct vb2_buffer *vb) return 0; } -static int sh_mobile_ceu_stop_streaming(struct vb2_queue *q) +static void sh_mobile_ceu_stop_streaming(struct vb2_queue *q) { struct soc_camera_device *icd = container_of(q, struct soc_camera_device, vb2_vidq); struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent); @@ -444,7 +444,7 @@ static int sh_mobile_ceu_stop_streaming(struct vb2_queue *q) spin_unlock_irqrestore(&pcdev->lock, flags); - return sh_mobile_ceu_soft_reset(pcdev); + sh_mobile_ceu_soft_reset(pcdev); } static struct vb2_ops sh_mobile_ceu_videobuf_ops = {