Received: by 2002:ac0:bc90:0:0:0:0:0 with SMTP id a16csp5583560img; Wed, 27 Mar 2019 11:08:27 -0700 (PDT) X-Google-Smtp-Source: APXvYqyskKnpampBnszaX4teO1IJcBO0ungahsefng4p0YxpxdYTcJfwAT4vV6Expjmhhu5cBz3e X-Received: by 2002:a62:5e46:: with SMTP id s67mr37003613pfb.126.1553710107739; Wed, 27 Mar 2019 11:08:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553710107; cv=none; d=google.com; s=arc-20160816; b=TyzNpRm3b+pWu3M/pXRW27qWJE8PnEYxjePPh/pEdNQ/QA+GWh4fGoq82PXHsMxo+u 2Lq9P0qaYBOKKjAxVtyWdGtBHYlmjTaARKkUlUtj92gi7cf7d7BnARG+ZpU8/Gx/tusM QkjLXMBB6lbZ2VgkoAuGI++in4BZHV+3P/lhy7qNjlzmZ/UVMLPrxp/oKjcg12HdzzXq oxXC2NgKOY6AYEWsggY+ZmhvvsanUinQwbWc5qDdNzRfz55Q/APuc6yLT2oD8ldxdSUa RTaduUw57QDAHtf9GQy70LOnjgRx6gllp4ILyRKYaMcH7oB/CrPkvUF5ekP/8LbJv26v 4akg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=67pHMiivyh/Zxw8FnTffocVOBWOiWpJ4Crn84iqgCd0=; b=b/azUZyIXzk24eZwsLCXasaDMw/2MzvZirk1+ryW8OLo6m8i+wxm0TH4hW3iPg2ALS YwaqwSNWvKoyCEuWo411F5QCEpkbTNVkexm4KRJie6IUqx9UvwZgnhGNX521TKlj4bgx hWxiIXgu7QyFghz0oKqpLky6ud5cVJbTW3LDuxXTzLZP9W0Ie24FcgVAJIAPjtGnAX7q RjiIf+SjupgOwefb3F+s7I30SRYuoepWtK4sJjEiG5csAt4yoONdPXl58F/Z1y3XCzs0 DHA5uRE7A3EhSofxe4hfEWQh2eP8VbP+tZqCTh3UBgnESc6pm9DkORuWi3N0zcVOR43t UxhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=2WURxLNO; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v21si18707103pff.44.2019.03.27.11.08.12; Wed, 27 Mar 2019 11:08:27 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=2WURxLNO; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732765AbfC0SFi (ORCPT + 99 others); Wed, 27 Mar 2019 14:05:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:46816 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387736AbfC0SFf (ORCPT ); Wed, 27 Mar 2019 14:05:35 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5C365217F5; Wed, 27 Mar 2019 18:05:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553709935; bh=D0g1jANusSy37pMB1z+g1OsJxUBEISQD2tz4/Jr7G+8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2WURxLNObmkb4YTUqRAMMx0D9bteCS9XYIyAPYePavBEZh8NN3FoTiBsFkbVMha4w caCPstUaZDPvC5KFYwvlYNr2gNVPS8RTASnaq/K2jDxc8h7JtzbJfxiGEwLo7gT9YI tia55IuBsRomGoTkF4igP7B4JbWO0rSe9HkLBs9M= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ezequiel Garcia , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin , linux-media@vger.kernel.org Subject: [PATCH AUTOSEL 5.0 120/262] media: sh_veu: Correct return type for mem2mem buffer helpers Date: Wed, 27 Mar 2019 13:59:35 -0400 Message-Id: <20190327180158.10245-120-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190327180158.10245-1-sashal@kernel.org> References: <20190327180158.10245-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ezequiel Garcia [ Upstream commit 43c145195c7fc3025ee7ecfc67112ac1c82af7c2 ] Fix the assigned type of mem2mem buffer handling API. Namely, these functions: v4l2_m2m_next_buf v4l2_m2m_last_buf v4l2_m2m_buf_remove v4l2_m2m_next_src_buf v4l2_m2m_next_dst_buf v4l2_m2m_last_src_buf v4l2_m2m_last_dst_buf v4l2_m2m_src_buf_remove v4l2_m2m_dst_buf_remove return a struct vb2_v4l2_buffer, and not a struct vb2_buffer. Fixing this is necessary to fix the mem2mem buffer handling API, changing the return to the correct struct vb2_v4l2_buffer instead of a void pointer. Signed-off-by: Ezequiel Garcia Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/platform/sh_veu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/sh_veu.c b/drivers/media/platform/sh_veu.c index 09ae64a0004c..d277cc674349 100644 --- a/drivers/media/platform/sh_veu.c +++ b/drivers/media/platform/sh_veu.c @@ -273,13 +273,13 @@ static void sh_veu_process(struct sh_veu_dev *veu, static void sh_veu_device_run(void *priv) { struct sh_veu_dev *veu = priv; - struct vb2_buffer *src_buf, *dst_buf; + struct vb2_v4l2_buffer *src_buf, *dst_buf; src_buf = v4l2_m2m_next_src_buf(veu->m2m_ctx); dst_buf = v4l2_m2m_next_dst_buf(veu->m2m_ctx); if (src_buf && dst_buf) - sh_veu_process(veu, src_buf, dst_buf); + sh_veu_process(veu, &src_buf->vb2_buf, &dst_buf->vb2_buf); } /* ========== video ioctls ========== */ -- 2.19.1