Received-SPF: pass (google.com: domain of linux-kernel+bounces-133132-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Date: Fri,  5 Apr 2024 14:14:05 +0000
In-Reply-To: <20240405141411.1807189-1-panikiel@google.com>
Precedence: bulk
Mime-Version: 1.0
References: <20240405141411.1807189-1-panikiel@google.com>
Message-ID: <20240405141411.1807189-11-panikiel@google.com>
Subject: [PATCH 10/16] media: i2c: tvp7002: Switch dv timing callbacks to pad ops
From: "=?UTF-8?q?Pawe=C5=82=20Anikiel?=" <panikiel@google.com>
To: kieran.bingham@ideasonboard.com, mchehab@kernel.org, 
	hverkuil-cisco@xs4all.nl, tharvey@gateworks.com, 
	niklas.soderlund@ragnatech.se, prabhakar.csengg@gmail.com, 
	charles-antoine.couret@nexvision.fr, thierry.reding@gmail.com, 
	jonathanh@nvidia.com, skomatineni@nvidia.com, luca.ceresoli@bootlin.com
Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, 
	chromeos-krk-upstreaming@google.com, 
	"=?UTF-8?q?Pawe=C5=82=20Anikiel?=" <panikiel@google.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

Change all (s|g|query)_dv_timings subdev callbacks to include
a pad argument.

Signed-off-by: Pawe=C5=82 Anikiel <panikiel@google.com>
---
 drivers/media/i2c/tvp7002.c | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/drivers/media/i2c/tvp7002.c b/drivers/media/i2c/tvp7002.c
index 6a04ffae5343..881b54f46d41 100644
--- a/drivers/media/i2c/tvp7002.c
+++ b/drivers/media/i2c/tvp7002.c
@@ -546,13 +546,16 @@ static int tvp7002_write_inittab(struct v4l2_subdev *=
sd,
 	return error;
 }
=20
-static int tvp7002_s_dv_timings(struct v4l2_subdev *sd,
+static int tvp7002_s_dv_timings(struct v4l2_subdev *sd, unsigned int pad,
 					struct v4l2_dv_timings *dv_timings)
 {
 	struct tvp7002 *device =3D to_tvp7002(sd);
 	const struct v4l2_bt_timings *bt =3D &dv_timings->bt;
 	int i;
=20
+	if (pad !=3D 0)
+		return -EINVAL;
+
 	if (dv_timings->type !=3D V4L2_DV_BT_656_1120)
 		return -EINVAL;
 	for (i =3D 0; i < NUM_TIMINGS; i++) {
@@ -566,11 +569,14 @@ static int tvp7002_s_dv_timings(struct v4l2_subdev *s=
d,
 	return -EINVAL;
 }
=20
-static int tvp7002_g_dv_timings(struct v4l2_subdev *sd,
+static int tvp7002_g_dv_timings(struct v4l2_subdev *sd, unsigned int pad,
 					struct v4l2_dv_timings *dv_timings)
 {
 	struct tvp7002 *device =3D to_tvp7002(sd);
=20
+	if (pad !=3D 0)
+		return -EINVAL;
+
 	*dv_timings =3D device->current_timings->timings;
 	return 0;
 }
@@ -659,12 +665,16 @@ static int tvp7002_query_dv(struct v4l2_subdev *sd, i=
nt *index)
 	return 0;
 }
=20
-static int tvp7002_query_dv_timings(struct v4l2_subdev *sd,
+static int tvp7002_query_dv_timings(struct v4l2_subdev *sd, unsigned int p=
ad,
 					struct v4l2_dv_timings *timings)
 {
 	int index;
-	int err =3D tvp7002_query_dv(sd, &index);
+	int err;
+
+	if (pad !=3D 0)
+		return -EINVAL;
=20
+	err =3D tvp7002_query_dv(sd, &index);
 	if (err)
 		return err;
 	*timings =3D tvp7002_timings[index].timings;
@@ -861,9 +871,6 @@ static const struct v4l2_subdev_core_ops tvp7002_core_o=
ps =3D {
=20
 /* Specific video subsystem operation handlers */
 static const struct v4l2_subdev_video_ops tvp7002_video_ops =3D {
-	.g_dv_timings =3D tvp7002_g_dv_timings,
-	.s_dv_timings =3D tvp7002_s_dv_timings,
-	.query_dv_timings =3D tvp7002_query_dv_timings,
 	.s_stream =3D tvp7002_s_stream,
 };
=20
@@ -872,6 +879,9 @@ static const struct v4l2_subdev_pad_ops tvp7002_pad_ops=
 =3D {
 	.enum_mbus_code =3D tvp7002_enum_mbus_code,
 	.get_fmt =3D tvp7002_get_pad_format,
 	.set_fmt =3D tvp7002_set_pad_format,
+	.g_dv_timings =3D tvp7002_g_dv_timings,
+	.s_dv_timings =3D tvp7002_s_dv_timings,
+	.query_dv_timings =3D tvp7002_query_dv_timings,
 	.enum_dv_timings =3D tvp7002_enum_dv_timings,
 };
=20
@@ -1001,7 +1011,7 @@ static int tvp7002_probe(struct i2c_client *c)
=20
 	/* Set registers according to default video mode */
 	timings =3D device->current_timings->timings;
-	error =3D tvp7002_s_dv_timings(sd, &timings);
+	error =3D tvp7002_s_dv_timings(sd, 0, &timings);
=20
 #if defined(CONFIG_MEDIA_CONTROLLER)
 	device->pad.flags =3D MEDIA_PAD_FL_SOURCE;
--=20
2.44.0.478.gd926399ef9-goog