diff mbox series

[3/5] media: intel/ipu6: Remove redundant ipu6_isys_subdev_to_csi2 macro

Message ID 20250401090953.473339-5-stanislaw.gruszka@linux.intel.com (mailing list archive)
State New
Headers show
Series media: intel/ipu6: initial ipu7 code sharing preparation | expand

Commit Message

Stanislaw Gruszka April 1, 2025, 9:09 a.m. UTC 
to_ipu6_isys_csi2 and ipu6_isys_subdev_to_csi2 are the same macros
with different name, use the former one consequently.

Signed-off-by: Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com>
---
 drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c  | 4 ++--
 drivers/media/pci/intel/ipu6/ipu6-isys-csi2.h  | 3 ---
 drivers/media/pci/intel/ipu6/ipu6-isys-video.c | 4 ++--
 drivers/media/pci/intel/ipu6/ipu6-isys.c       | 2 +-
 4 files changed, 5 insertions(+), 8 deletions(-)
diff mbox series

Patch

diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c b/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c
index 531de32419c6..a59231d81f80 100644
--- a/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c
+++ b/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c
@@ -560,7 +560,7 @@  void ipu6_isys_csi2_sof_event_by_stream(struct ipu6_isys_stream *stream)
 {
 	struct video_device *vdev = stream->asd->sd.devnode;
 	struct device *dev = &stream->isys->adev->auxdev.dev;
-	struct ipu6_isys_csi2 *csi2 = ipu6_isys_subdev_to_csi2(stream->asd);
+	struct ipu6_isys_csi2 *csi2 = to_ipu6_isys_csi2(stream->asd);
 	struct v4l2_event ev = {
 		.type = V4L2_EVENT_FRAME_SYNC,
 	};
@@ -575,7 +575,7 @@  void ipu6_isys_csi2_sof_event_by_stream(struct ipu6_isys_stream *stream)
 void ipu6_isys_csi2_eof_event_by_stream(struct ipu6_isys_stream *stream)
 {
 	struct device *dev = &stream->isys->adev->auxdev.dev;
-	struct ipu6_isys_csi2 *csi2 = ipu6_isys_subdev_to_csi2(stream->asd);
+	struct ipu6_isys_csi2 *csi2 = to_ipu6_isys_csi2(stream->asd);
 	u32 frame_sequence = atomic_read(&stream->sequence);
 
 	dev_dbg(dev, "eof_event::csi2-%i sequence: %i\n",
diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.h b/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.h
index ce8eed91065c..24ed13b4a63f 100644
--- a/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.h
+++ b/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.h
@@ -57,9 +57,6 @@  struct ipu6_csi2_error {
 	bool is_info_only;
 };
 
-#define ipu6_isys_subdev_to_csi2(__sd) \
-	container_of(__sd, struct ipu6_isys_csi2, asd)
-
 #define to_ipu6_isys_csi2(__asd) container_of(__asd, struct ipu6_isys_csi2, asd)
 
 s64 ipu6_isys_csi2_get_link_freq(struct ipu6_isys_csi2 *csi2);
diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys-video.c b/drivers/media/pci/intel/ipu6/ipu6-isys-video.c
index 2d3506d84922..17ae8bb55234 100644
--- a/drivers/media/pci/intel/ipu6/ipu6-isys-video.c
+++ b/drivers/media/pci/intel/ipu6/ipu6-isys-video.c
@@ -729,7 +729,7 @@  int ipu6_isys_video_prepare_stream(struct ipu6_isys_video *av,
 		return -EINVAL;
 
 	stream->stream_source = stream->asd->source;
-	csi2 = ipu6_isys_subdev_to_csi2(stream->asd);
+	csi2 = to_ipu6_isys_csi2(stream->asd);
 	csi2->receiver_errors = 0;
 	stream->source_entity = source_entity;
 
@@ -771,7 +771,7 @@  void ipu6_isys_configure_stream_watermark(struct ipu6_isys_video *av,
 	else
 		av->watermark.hblank = 0;
 
-	csi2 = ipu6_isys_subdev_to_csi2(av->stream->asd);
+	csi2 = to_ipu6_isys_csi2(av->stream->asd);
 	link_freq = ipu6_isys_csi2_get_link_freq(csi2);
 	if (link_freq > 0) {
 		lanes = csi2->nlanes;
diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys.c b/drivers/media/pci/intel/ipu6/ipu6-isys.c
index 8df1d83a74b5..9b7ff5c440de 100644
--- a/drivers/media/pci/intel/ipu6/ipu6-isys.c
+++ b/drivers/media/pci/intel/ipu6/ipu6-isys.c
@@ -1266,7 +1266,7 @@  static int isys_isr_one(struct ipu6_bus_device *adev)
 	}
 	stream->error = resp->error_info.error;
 
-	csi2 = ipu6_isys_subdev_to_csi2(stream->asd);
+	csi2 = to_ipu6_isys_csi2(stream->asd);
 
 	switch (resp->type) {
 	case IPU6_FW_ISYS_RESP_TYPE_STREAM_OPEN_DONE: