Received-SPF: pass (google.com: domain of linux-kernel+bounces-133124-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Date: Fri,  5 Apr 2024 14:13:57 +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-3-panikiel@google.com>
Subject: [PATCH 02/16] media: i2c: adv748x: 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/adv748x/adv748x-hdmi.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/media/i2c/adv748x/adv748x-hdmi.c b/drivers/media/i2c/a=
dv748x/adv748x-hdmi.c
index ec151dc69c23..a4db9bae5f79 100644
--- a/drivers/media/i2c/adv748x/adv748x-hdmi.c
+++ b/drivers/media/i2c/adv748x/adv748x-hdmi.c
@@ -214,7 +214,7 @@ static int adv748x_hdmi_set_video_timings(struct adv748=
x_state *state,
  * v4l2_subdev_video_ops
  */
=20
-static int adv748x_hdmi_s_dv_timings(struct v4l2_subdev *sd,
+static int adv748x_hdmi_s_dv_timings(struct v4l2_subdev *sd, unsigned int =
pad,
 				     struct v4l2_dv_timings *timings)
 {
 	struct adv748x_hdmi *hdmi =3D adv748x_sd_to_hdmi(sd);
@@ -254,7 +254,7 @@ static int adv748x_hdmi_s_dv_timings(struct v4l2_subdev=
 *sd,
 	return ret;
 }
=20
-static int adv748x_hdmi_g_dv_timings(struct v4l2_subdev *sd,
+static int adv748x_hdmi_g_dv_timings(struct v4l2_subdev *sd, unsigned int =
pad,
 				     struct v4l2_dv_timings *timings)
 {
 	struct adv748x_hdmi *hdmi =3D adv748x_sd_to_hdmi(sd);
@@ -269,7 +269,7 @@ static int adv748x_hdmi_g_dv_timings(struct v4l2_subdev=
 *sd,
 	return 0;
 }
=20
-static int adv748x_hdmi_query_dv_timings(struct v4l2_subdev *sd,
+static int adv748x_hdmi_query_dv_timings(struct v4l2_subdev *sd, unsigned =
int pad,
 					 struct v4l2_dv_timings *timings)
 {
 	struct adv748x_hdmi *hdmi =3D adv748x_sd_to_hdmi(sd);
@@ -392,9 +392,6 @@ static int adv748x_hdmi_g_pixelaspect(struct v4l2_subde=
v *sd,
 }
=20
 static const struct v4l2_subdev_video_ops adv748x_video_ops_hdmi =3D {
-	.s_dv_timings =3D adv748x_hdmi_s_dv_timings,
-	.g_dv_timings =3D adv748x_hdmi_g_dv_timings,
-	.query_dv_timings =3D adv748x_hdmi_query_dv_timings,
 	.g_input_status =3D adv748x_hdmi_g_input_status,
 	.s_stream =3D adv748x_hdmi_s_stream,
 	.g_pixelaspect =3D adv748x_hdmi_g_pixelaspect,
@@ -413,7 +410,7 @@ static int adv748x_hdmi_propagate_pixelrate(struct adv7=
48x_hdmi *hdmi)
 	if (!tx)
 		return -ENOLINK;
=20
-	adv748x_hdmi_query_dv_timings(&hdmi->sd, &timings);
+	adv748x_hdmi_query_dv_timings(&hdmi->sd, 0, &timings);
=20
 	return adv748x_csi2_set_pixelrate(tx, timings.bt.pixelclock);
 }
@@ -610,6 +607,9 @@ static const struct v4l2_subdev_pad_ops adv748x_pad_ops=
_hdmi =3D {
 	.get_fmt =3D adv748x_hdmi_get_format,
 	.get_edid =3D adv748x_hdmi_get_edid,
 	.set_edid =3D adv748x_hdmi_set_edid,
+	.s_dv_timings =3D adv748x_hdmi_s_dv_timings,
+	.g_dv_timings =3D adv748x_hdmi_g_dv_timings,
+	.query_dv_timings =3D adv748x_hdmi_query_dv_timings,
 	.dv_timings_cap =3D adv748x_hdmi_dv_timings_cap,
 	.enum_dv_timings =3D adv748x_hdmi_enum_dv_timings,
 };
@@ -734,7 +734,7 @@ int adv748x_hdmi_init(struct adv748x_hdmi *hdmi)
 	struct v4l2_dv_timings cea1280x720 =3D V4L2_DV_BT_CEA_1280X720P30;
 	int ret;
=20
-	adv748x_hdmi_s_dv_timings(&hdmi->sd, &cea1280x720);
+	adv748x_hdmi_s_dv_timings(&hdmi->sd, 0, &cea1280x720);
=20
 	/* Initialise a default 16:9 aspect ratio */
 	hdmi->aspect_ratio.numerator =3D 16;
--=20
2.44.0.478.gd926399ef9-goog