Received: by 2002:ac0:bc90:0:0:0:0:0 with SMTP id a16csp5596577img; Wed, 27 Mar 2019 11:22:39 -0700 (PDT) X-Google-Smtp-Source: APXvYqyEHrkqXJBXyBSgbZyqDmmyr2GW/pt8ANnCUmjmPaUgvc3uqdabjlKKJPdHIIdHxYdteDgF X-Received: by 2002:a62:ab12:: with SMTP id p18mr24236440pff.216.1553710959519; Wed, 27 Mar 2019 11:22:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553710959; cv=none; d=google.com; s=arc-20160816; b=jIRyLdBnBU0bqkML50/lWEZl5d3rWhdQA2qIV2kwZb7cg7hqMECQlBVgaAdXrzy42U BihZqqYjWAtwQeKM7GGFUePL1rielnBU3ZF8XRGrnSTUvopm39yeqTXWd4kt0uCJoMBz F3eXZI1YRhMuOYcy3ZY+y+2bin6aQshT4lSRmjutI4jS0C8J1RXsbCimAWe3g+CnIwSt rUQ+vQYKeO4rqAC4HK5Lp/UblE86Zkhj2Z2jyjDWjVMvjBlyFgtANhxfQMNBs7bETZ1H 1Xr+1QmcHNfFGK4VV6E7f/mtUuio4MXDLvx2Uu+bsFZlRoWgUURy7Boft6gEpZwgTpeq pA+Q== 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=WR1cwCLWkjix4vN3vFtIJPqVB3Yx8FffpDADa1gUDrU=; b=lq9aBDdWyrVSysA8hIFzGjCz5H5WLf0cWDAQe1pegu2KNirWfBX6iWDXpwVTZdWuhY ozOYS1fcAAhAOyAx1vHjh0u4SPAX5mL3lXQXv2ZjC5WMz95QrV/+adAkg+H6dOK+K/A/ Y4j9ELU00AsExLggZMHc76qRDGObkPi0N/2kjFYNrqoDHc8D4nQft6UIix85o8Jlh0GW Q9ruQOpsCdwBqdG1O1rUPCGslkXc9zTWse9Hxc18qlQoyn8Us5cTXJs15RoOsqYpdveS T0WnANth6s31h83T7N4KjCkDOOlJlTZuEb+dZbsXyK/1ON94U9XROi5ts7Kta0iR5kyj alrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=RXqIOWkx; 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 p2si8951641pgk.326.2019.03.27.11.22.24; Wed, 27 Mar 2019 11:22:39 -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=RXqIOWkx; 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 S2388836AbfC0SVt (ORCPT + 99 others); Wed, 27 Mar 2019 14:21:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:39712 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390938AbfC0SVr (ORCPT ); Wed, 27 Mar 2019 14:21:47 -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 7740620651; Wed, 27 Mar 2019 18:21:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553710906; bh=OHA+uy2nrCWE74pWn7XAh3ATSHXusEDNrJ/mO0g3SGw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RXqIOWkxzj23pkmNwrOSusMyCD5Dmd7Ro3yas4J0qFto4QqN4qFBs3uaYFI0HgdVK Sa7hvtDzmsA22KrWp0xXD/WbKU0VgZogRsYhXAYj2mP4+ymtRo9Xazq6msjxKjlmWF hpj8Q7AD/8mT0KfEfa36KyTpyHU21Hksr6iND9Ng= 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 4.9 39/87] media: sh_veu: Correct return type for mem2mem buffer helpers Date: Wed, 27 Mar 2019 14:19:52 -0400 Message-Id: <20190327182040.17444-39-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190327182040.17444-1-sashal@kernel.org> References: <20190327182040.17444-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 15a562af13c7..a4f593220ef0 100644 --- a/drivers/media/platform/sh_veu.c +++ b/drivers/media/platform/sh_veu.c @@ -276,13 +276,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