Received-SPF: pass (google.com: domain of linux-kernel+bounces-133133-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Date: Fri,  5 Apr 2024 14:14:06 +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-12-panikiel@google.com>
Subject: [PATCH 11/16] media: spi: gs1662: 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/spi/gs1662.c | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/drivers/media/spi/gs1662.c b/drivers/media/spi/gs1662.c
index 75c21a93e6d0..44f97e99ff15 100644
--- a/drivers/media/spi/gs1662.c
+++ b/drivers/media/spi/gs1662.c
@@ -259,12 +259,15 @@ static inline struct gs *to_gs(struct v4l2_subdev *sd=
)
 	return container_of(sd, struct gs, sd);
 }
=20
-static int gs_s_dv_timings(struct v4l2_subdev *sd,
+static int gs_s_dv_timings(struct v4l2_subdev *sd, unsigned int pad,
 		    struct v4l2_dv_timings *timings)
 {
 	struct gs *gs =3D to_gs(sd);
 	int reg_value;
=20
+	if (pad !=3D 0)
+		return -EINVAL;
+
 	reg_value =3D get_register_timings(timings);
 	if (reg_value =3D=3D 0x0)
 		return -EINVAL;
@@ -273,16 +276,19 @@ static int gs_s_dv_timings(struct v4l2_subdev *sd,
 	return 0;
 }
=20
-static int gs_g_dv_timings(struct v4l2_subdev *sd,
+static int gs_g_dv_timings(struct v4l2_subdev *sd, unsigned int pad,
 		    struct v4l2_dv_timings *timings)
 {
 	struct gs *gs =3D to_gs(sd);
=20
+	if (pad !=3D 0)
+		return -EINVAL;
+
 	*timings =3D gs->current_timings;
 	return 0;
 }
=20
-static int gs_query_dv_timings(struct v4l2_subdev *sd,
+static int gs_query_dv_timings(struct v4l2_subdev *sd, unsigned int pad,
 			struct v4l2_dv_timings *timings)
 {
 	struct gs *gs =3D to_gs(sd);
@@ -290,6 +296,9 @@ static int gs_query_dv_timings(struct v4l2_subdev *sd,
 	u16 reg_value, i;
 	int ret;
=20
+	if (pad !=3D 0)
+		return -EINVAL;
+
 	if (gs->enabled)
 		return -EBUSY;
=20
@@ -410,14 +419,14 @@ static const struct v4l2_subdev_core_ops gs_core_ops =
=3D {
 };
=20
 static const struct v4l2_subdev_video_ops gs_video_ops =3D {
-	.s_dv_timings =3D gs_s_dv_timings,
-	.g_dv_timings =3D gs_g_dv_timings,
 	.s_stream =3D gs_s_stream,
 	.g_input_status =3D gs_g_input_status,
-	.query_dv_timings =3D gs_query_dv_timings,
 };
=20
 static const struct v4l2_subdev_pad_ops gs_pad_ops =3D {
+	.s_dv_timings =3D gs_s_dv_timings,
+	.g_dv_timings =3D gs_g_dv_timings,
+	.query_dv_timings =3D gs_query_dv_timings,
 	.enum_dv_timings =3D gs_enum_dv_timings,
 	.dv_timings_cap =3D gs_dv_timings_cap,
 };
--=20
2.44.0.478.gd926399ef9-goog