From nobody Fri Dec 19 20:15:30 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8FD90181CFD; Sun, 24 Mar 2024 23:49:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711324141; cv=none; b=UjFd7a3/lj0IIUwOqNgpapexYjclR+Sr1+DtnQa74ppsXTYTDIxZ7p/a+XKlL5hWQ62Vh++BNnrSDDXUT8a7hYeevN1uwo4Wr3YQdyrhhSYAcLeD1AhljmBnEKs9w08EhcvcrPTBkopnel1WoOEVhRF37JTOan4Prs0ijOrWPsg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711324141; c=relaxed/simple; bh=oqK8V1hYn9cnmP/x01f7f4fW4CTXRYn8qwhuMOtNFZc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=hK3ZUvendL2TPpVXreooUEzibEmcwycznANujFZe/SMy4oDwehL8AU8vGfz29wkBecAwNoZONwSti9iHXbV7mDfYvzRICtEBwJYpvj2JIW07haXvVxkGsJduqGW0cdCnh95f5M0+tAhhSdgcoaNYGV6nnz8Kufa/n6ZWPZzFyJw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=pbZSxk5M; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="pbZSxk5M" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 84F77C43394; Sun, 24 Mar 2024 23:49:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711324141; bh=oqK8V1hYn9cnmP/x01f7f4fW4CTXRYn8qwhuMOtNFZc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pbZSxk5MwtzAJaijEj0aXxN7URsDOVER6I6KNEvCBM6d2lDuhzjkDph/u5lB0tMxO sa5hIcRlqnd3sGzYCzFKWGZNPxF8uzWPq6pkLknwllKQG+SKFFvs64vn+5mZcNCs6g 8Kmb//KlmGzLKcSsGM/2nsniePKXl2VsyleNjNM2QFv6V+5Uw0mG+VusAyZ+Kz8rbG AxT0XdikOEUE2vsD/HMX5TwA6czJh/uD53tidNmjxIJ3OaRbEzUTcBRMirm1T9CDub EQ7ZWt3IRscPoUwC6ZYAyCkhVQ4JnCuXpN9dn/u4s87HKkjc56x1UcImlHO/TZSX7v aTpAkfQRfLHHA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Hans Verkuil , Sakari Ailus , Laurent Pinchart , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 5.4 137/183] media: rename VFL_TYPE_GRABBER to _VIDEO Date: Sun, 24 Mar 2024 19:45:50 -0400 Message-ID: <20240324234638.1355609-138-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324234638.1355609-1-sashal@kernel.org> References: <20240324234638.1355609-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Hans Verkuil [ Upstream commit 238e4a5baa361256ae1641ad9455bb2bb359273f ] We currently have the following devnode types: enum vfl_devnode_type { VFL_TYPE_GRABBER =3D 0, VFL_TYPE_VBI, VFL_TYPE_RADIO, VFL_TYPE_SUBDEV, VFL_TYPE_SDR, VFL_TYPE_TOUCH, VFL_TYPE_MAX /* Shall be the last one */ }; They all make sense, except for the first: GRABBER really refers to /dev/vi= deoX devices, which can be capture, output or m2m, so 'grabber' doesn't even ref= er to their function anymore. Let's call a spade a spade and rename this to VFL_TYPE_VIDEO. Signed-off-by: Hans Verkuil Acked-by: Sakari Ailus Reviewed-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab Stable-dep-of: d0b07f712bf6 ("media: ttpci: fix two memleaks in budget_av_a= ttach") Signed-off-by: Sasha Levin --- Documentation/media/kapi/v4l2-dev.rst | 4 ++-- .../translations/zh_CN/video4linux/v4l2-framework.txt | 4 ++-- drivers/media/v4l2-core/v4l2-dev.c | 10 +++++----- drivers/media/v4l2-core/v4l2-ioctl.c | 4 ++-- include/media/v4l2-dev.h | 6 ++++-- samples/v4l/v4l2-pci-skeleton.c | 2 +- 6 files changed, 16 insertions(+), 14 deletions(-) diff --git a/Documentation/media/kapi/v4l2-dev.rst b/Documentation/media/ka= pi/v4l2-dev.rst index 4c5a15c53dbfb..63c064837c008 100644 --- a/Documentation/media/kapi/v4l2-dev.rst +++ b/Documentation/media/kapi/v4l2-dev.rst @@ -185,7 +185,7 @@ This will create the character device for you. =20 .. code-block:: c =20 - err =3D video_register_device(vdev, VFL_TYPE_GRABBER, -1); + err =3D video_register_device(vdev, VFL_TYPE_VIDEO, -1); if (err) { video_device_release(vdev); /* or kfree(my_vdev); */ return err; @@ -201,7 +201,7 @@ types exist: =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D :c:type:`vfl_devnode_type` Device name Usage =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D -``VFL_TYPE_GRABBER`` ``/dev/videoX`` for video input/output de= vices +``VFL_TYPE_VIDEO`` ``/dev/videoX`` for video input/output de= vices ``VFL_TYPE_VBI`` ``/dev/vbiX`` for vertical blank data (= i.e. closed captions, teletext) ``VFL_TYPE_RADIO`` ``/dev/radioX`` for radio tuners diff --git a/Documentation/translations/zh_CN/video4linux/v4l2-framework.tx= t b/Documentation/translations/zh_CN/video4linux/v4l2-framework.txt index 66c7c568bd866..9c39ee58ea507 100644 --- a/Documentation/translations/zh_CN/video4linux/v4l2-framework.txt +++ b/Documentation/translations/zh_CN/video4linux/v4l2-framework.txt @@ -649,7 +649,7 @@ video_device=E6=B3=A8=E5=86=8C =20 =E6=8E=A5=E4=B8=8B=E6=9D=A5=E4=BD=A0=E9=9C=80=E8=A6=81=E6=B3=A8=E5=86=8C= =E8=A7=86=E9=A2=91=E8=AE=BE=E5=A4=87=EF=BC=9A=E8=BF=99=E4=BC=9A=E4=B8=BA=E4= =BD=A0=E5=88=9B=E5=BB=BA=E4=B8=80=E4=B8=AA=E5=AD=97=E7=AC=A6=E8=AE=BE=E5=A4= =87=E3=80=82 =20 - err =3D video_register_device(vdev, VFL_TYPE_GRABBER, -1); + err =3D video_register_device(vdev, VFL_TYPE_VIDEO, -1); if (err) { video_device_release(vdev); /* or kfree(my_vdev); */ return err; @@ -660,7 +660,7 @@ video_device=E6=B3=A8=E5=86=8C =20 =E6=B3=A8=E5=86=8C=E5=93=AA=E7=A7=8D=E8=AE=BE=E5=A4=87=E6=98=AF=E6=A0=B9= =E6=8D=AE=E7=B1=BB=E5=9E=8B=EF=BC=88type=EF=BC=89=E5=8F=82=E6=95=B0=E3=80= =82=E5=AD=98=E5=9C=A8=E4=BB=A5=E4=B8=8B=E7=B1=BB=E5=9E=8B=EF=BC=9A =20 -VFL_TYPE_GRABBER: =E7=94=A8=E4=BA=8E=E8=A7=86=E9=A2=91=E8=BE=93=E5=85=A5/= =E8=BE=93=E5=87=BA=E8=AE=BE=E5=A4=87=E7=9A=84 videoX +VFL_TYPE_VIDEO: =E7=94=A8=E4=BA=8E=E8=A7=86=E9=A2=91=E8=BE=93=E5=85=A5/=E8= =BE=93=E5=87=BA=E8=AE=BE=E5=A4=87=E7=9A=84 videoX VFL_TYPE_VBI: =E7=94=A8=E4=BA=8E=E5=9E=82=E7=9B=B4=E6=B6=88=E9=9A=90=E6=95= =B0=E6=8D=AE=E7=9A=84 vbiX (=E4=BE=8B=E5=A6=82=EF=BC=8C=E9=9A=90=E8=97=8F= =E5=BC=8F=E5=AD=97=E5=B9=95=EF=BC=8C=E5=9B=BE=E6=96=87=E7=94=B5=E8=A7=86) VFL_TYPE_RADIO: =E7=94=A8=E4=BA=8E=E5=B9=BF=E6=92=AD=E8=B0=83=E8=B0=90=E5= =99=A8=E7=9A=84 radioX =20 diff --git a/drivers/media/v4l2-core/v4l2-dev.c b/drivers/media/v4l2-core/v= 4l2-dev.c index 1bf543932e4f9..ddc861868ce08 100644 --- a/drivers/media/v4l2-core/v4l2-dev.c +++ b/drivers/media/v4l2-core/v4l2-dev.c @@ -542,13 +542,13 @@ static void determine_valid_ioctls(struct video_devic= e *vdev) V4L2_CAP_META_OUTPUT; DECLARE_BITMAP(valid_ioctls, BASE_VIDIOC_PRIVATE); const struct v4l2_ioctl_ops *ops =3D vdev->ioctl_ops; - bool is_vid =3D vdev->vfl_type =3D=3D VFL_TYPE_GRABBER && + bool is_vid =3D vdev->vfl_type =3D=3D VFL_TYPE_VIDEO && (vdev->device_caps & vid_caps); bool is_vbi =3D vdev->vfl_type =3D=3D VFL_TYPE_VBI; bool is_radio =3D vdev->vfl_type =3D=3D VFL_TYPE_RADIO; bool is_sdr =3D vdev->vfl_type =3D=3D VFL_TYPE_SDR; bool is_tch =3D vdev->vfl_type =3D=3D VFL_TYPE_TOUCH; - bool is_meta =3D vdev->vfl_type =3D=3D VFL_TYPE_GRABBER && + bool is_meta =3D vdev->vfl_type =3D=3D VFL_TYPE_VIDEO && (vdev->device_caps & meta_caps); bool is_rx =3D vdev->vfl_dir !=3D VFL_DIR_TX; bool is_tx =3D vdev->vfl_dir !=3D VFL_DIR_RX; @@ -777,7 +777,7 @@ static int video_register_media_controller(struct video= _device *vdev) vdev->entity.function =3D MEDIA_ENT_F_UNKNOWN; =20 switch (vdev->vfl_type) { - case VFL_TYPE_GRABBER: + case VFL_TYPE_VIDEO: intf_type =3D MEDIA_INTF_T_V4L_VIDEO; vdev->entity.function =3D MEDIA_ENT_F_IO_V4L; break; @@ -885,7 +885,7 @@ int __video_register_device(struct video_device *vdev, =20 /* Part 1: check device type */ switch (type) { - case VFL_TYPE_GRABBER: + case VFL_TYPE_VIDEO: name_base =3D "video"; break; case VFL_TYPE_VBI: @@ -929,7 +929,7 @@ int __video_register_device(struct video_device *vdev, * of 128-191 and just pick the first free minor there * (new style). */ switch (type) { - case VFL_TYPE_GRABBER: + case VFL_TYPE_VIDEO: minor_offset =3D 0; minor_cnt =3D 64; break; diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core= /v4l2-ioctl.c index b8edef9160864..682ba53b1a7a7 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c @@ -959,12 +959,12 @@ static int check_fmt(struct file *file, enum v4l2_buf= _type type) V4L2_CAP_META_OUTPUT; struct video_device *vfd =3D video_devdata(file); const struct v4l2_ioctl_ops *ops =3D vfd->ioctl_ops; - bool is_vid =3D vfd->vfl_type =3D=3D VFL_TYPE_GRABBER && + bool is_vid =3D vfd->vfl_type =3D=3D VFL_TYPE_VIDEO && (vfd->device_caps & vid_caps); bool is_vbi =3D vfd->vfl_type =3D=3D VFL_TYPE_VBI; bool is_sdr =3D vfd->vfl_type =3D=3D VFL_TYPE_SDR; bool is_tch =3D vfd->vfl_type =3D=3D VFL_TYPE_TOUCH; - bool is_meta =3D vfd->vfl_type =3D=3D VFL_TYPE_GRABBER && + bool is_meta =3D vfd->vfl_type =3D=3D VFL_TYPE_VIDEO && (vfd->device_caps & meta_caps); bool is_rx =3D vfd->vfl_dir !=3D VFL_DIR_TX; bool is_tx =3D vfd->vfl_dir !=3D VFL_DIR_RX; diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h index 48531e57cc5a8..5e7c0f8acd054 100644 --- a/include/media/v4l2-dev.h +++ b/include/media/v4l2-dev.h @@ -24,7 +24,8 @@ /** * enum vfl_devnode_type - type of V4L2 device node * - * @VFL_TYPE_GRABBER: for video input/output devices + * @VFL_TYPE_VIDEO: for video input/output devices + * @VFL_TYPE_GRABBER: deprecated, same as VFL_TYPE_VIDEO * @VFL_TYPE_VBI: for vertical blank data (i.e. closed captions, teletext) * @VFL_TYPE_RADIO: for radio tuners * @VFL_TYPE_SUBDEV: for V4L2 subdevices @@ -33,7 +34,8 @@ * @VFL_TYPE_MAX: number of VFL types, must always be last in the enum */ enum vfl_devnode_type { - VFL_TYPE_GRABBER =3D 0, + VFL_TYPE_VIDEO, + VFL_TYPE_GRABBER =3D VFL_TYPE_VIDEO, VFL_TYPE_VBI, VFL_TYPE_RADIO, VFL_TYPE_SUBDEV, diff --git a/samples/v4l/v4l2-pci-skeleton.c b/samples/v4l/v4l2-pci-skeleto= n.c index f6a551bd57ef1..3fa6582b4a689 100644 --- a/samples/v4l/v4l2-pci-skeleton.c +++ b/samples/v4l/v4l2-pci-skeleton.c @@ -879,7 +879,7 @@ static int skeleton_probe(struct pci_dev *pdev, const s= truct pci_device_id *ent) vdev->tvnorms =3D SKEL_TVNORMS; video_set_drvdata(vdev, skel); =20 - ret =3D video_register_device(vdev, VFL_TYPE_GRABBER, -1); + ret =3D video_register_device(vdev, VFL_TYPE_VIDEO, -1); if (ret) goto free_hdl; =20 --=20 2.43.0