From patchwork Mon Apr 28 16:16:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanislaw Gruszka X-Patchwork-Id: 885636 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.16]) (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 16411279789 for ; Mon, 28 Apr 2025 16:16:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.16 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745857021; cv=none; b=bmmFgFJJ8utSMWYLM1128XPLoOdiNooCC+r43iug9iR9xnmtngMLJCg/gDT75Nx3PjQdi/6u5qOoF8TZVO0jfXUzoQnW9s7L61hzR4H0CEVP9b3092/mvL1SeRJl4aO9eW3a1xJEsvMsTSzUQf7LO42nN/WPPXchDErqxR4PNco= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745857021; c=relaxed/simple; bh=OektgsmfKk963NaqrIENyN4vGCTuLbafDvoklirhBxE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=jk8G9au3SIS+77s57OsN1KZdNNiRDj/GRzzmY0/y04QtBpchbqiYK6GsFownFcLKBWLnSQMgvpeYj43O0pFKRb4VG0fkNLMLGzncGPQA7iMWB54JFBTd4rqX/0VwHAVKBN3npyQnoxraH/4EV4gX9Zy12lCN5A+zQCMbfiWZIbU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=KxaZTFD+; arc=none smtp.client-ip=198.175.65.16 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="KxaZTFD+" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1745857020; x=1777393020; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=OektgsmfKk963NaqrIENyN4vGCTuLbafDvoklirhBxE=; b=KxaZTFD++I/cowzzd/tkcQ2L5smWbC7yBL0AwRrlYhiUCcI4llFjBw6/ mjaL7Tyii6JNoEjdHypH7JNKuludYXvc77tsPdMw/LH/0Ihio1K/wSh+A JlyvYPl0aDgKEZunGKjX52tR/NQL04laH9aLv5+GK+6K1QTeksJ2v6fU5 zzfROIG3JKevdhfZPKlcGs3Xm7DAu3wwDWTDtEBmiC8oKzXxsY0pyQ78Z BNGksyzhiiP/GPNlBbPFYosC4eIwQR/I0JvJ6YSw9iPIy7sIcp9nDR7vL Ur0MMFOsmeW2YJcE2iqsfxrH1mqmIwRpxtYq/C4NfNQQjjNTSroqVeOxj g==; X-CSE-ConnectionGUID: BJHKPxS9TyGVGX3LBh4CtQ== X-CSE-MsgGUID: BpbGagQRR7y942W0J06rVA== X-IronPort-AV: E=McAfee;i="6700,10204,11417"; a="47547141" X-IronPort-AV: E=Sophos;i="6.15,246,1739865600"; d="scan'208";a="47547141" Received: from orviesa002.jf.intel.com ([10.64.159.142]) by orvoesa108.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Apr 2025 09:16:59 -0700 X-CSE-ConnectionGUID: cpO7UqWvQgaKlD+OJsBbjw== X-CSE-MsgGUID: dmaCD2vTQLS/tb0CaL24hA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,246,1739865600"; d="scan'208";a="164522866" Received: from sgruszka-mobl.ger.corp.intel.com (HELO localhost) ([10.245.253.52]) by orviesa002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Apr 2025 09:16:58 -0700 From: Stanislaw Gruszka To: linux-media@vger.kernel.org Cc: Sakari Ailus , Bingbu Cao Subject: [PATCH v2 3/5] media: intel/ipu6: Remove redundant ipu6_isys_subdev_to_csi2 macro Date: Mon, 28 Apr 2025 18:16:41 +0200 Message-Id: <20250428161643.321617-4-stanislaw.gruszka@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250428161643.321617-1-stanislaw.gruszka@linux.intel.com> References: <20250428161643.321617-1-stanislaw.gruszka@linux.intel.com> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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 --- 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 --git a/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c b/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c index 543f81b1899f..c8935bf7df31 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 f2e8922be166..c11e62a44fbf 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: From patchwork Mon Apr 28 16:16:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanislaw Gruszka X-Patchwork-Id: 885635 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.16]) (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 8640D27A913 for ; Mon, 28 Apr 2025 16:17:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.16 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745857025; cv=none; b=JPgoydPPwR6ZoHddhme20DZgqm72Qfrf0rwG0m+u58LFzoN6hTjki/9UxaRZH+1zrPUZ443wuZvm4eY5nIZj2EYe6gp2WdyRJ+wtyqYRbUZTPcI1WZKlPwBmwShnjGIlzH1C5i5mkjV9ZeMlqNSe62ZNOL9CVKdLAY4BP0/tAss= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745857025; c=relaxed/simple; bh=KjF3tgXP4UXBoZaT0uoVjNihMeEp5lsKSwIRIOOyzZU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=OkZUjXP6vI2JF2tYZ412grs5JqyQ72dwnuw7nblBWLUNw4U8gQ1Etp/ClhSpyUmLiwbMs7rRYmHokhnzvW9aYQZYkcQxHkV5pNFin05JvBxJ8cpCj2qOU0+Dy706iDGueXvzhV2pBPmdJZKjEMAve5Dr6yZCZwfewXUEFA8eU4E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=MJIHfgbr; arc=none smtp.client-ip=198.175.65.16 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="MJIHfgbr" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1745857023; x=1777393023; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=KjF3tgXP4UXBoZaT0uoVjNihMeEp5lsKSwIRIOOyzZU=; b=MJIHfgbrnxXjEC23vIXIuFhuz1pJa+lTnRdRmVUmrCYH9lZUnTGchFII Dwmgz49CefJ8au83kwydQKPmv3ajT7PrCyon7sb6vIBwHXc0A9Y9Glhyz HSdRNdA5cxX3izUSB6mYhldcXQDz81T6SaTCpsofHD89QXwZF98yJczYP QEuLzeCeADrx+/k73AnOAmAIibZT9OfSX5JlMIHykpreZ5OYG0DvSyA6h ygQxzFXvRf1kJFgJ9VgPrZqw5aNSIB9Iug3JWPxnF6Tsv59dkVIzM4lxD V9QQvfi8PotPKNLNYM19+C1S8RkgakI7Apjg6iFTVf1zdOMto4npcZSLs Q==; X-CSE-ConnectionGUID: np+YrEDjSOiusmHcgq7eYg== X-CSE-MsgGUID: XyBOVDOqT7WF4ttrd/U58w== X-IronPort-AV: E=McAfee;i="6700,10204,11417"; a="47547144" X-IronPort-AV: E=Sophos;i="6.15,246,1739865600"; d="scan'208";a="47547144" Received: from orviesa002.jf.intel.com ([10.64.159.142]) by orvoesa108.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Apr 2025 09:17:03 -0700 X-CSE-ConnectionGUID: lU0N23WXRNSVqmVb+yjZLA== X-CSE-MsgGUID: FwJH77OZSr2LvJldEZ+cag== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,246,1739865600"; d="scan'208";a="164522892" Received: from sgruszka-mobl.ger.corp.intel.com (HELO localhost) ([10.245.253.52]) by orviesa002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Apr 2025 09:17:02 -0700 From: Stanislaw Gruszka To: linux-media@vger.kernel.org Cc: Sakari Ailus , Bingbu Cao Subject: [PATCH v2 4/5] media: intel/ipu6: Rename ipu6_isys_subdev Date: Mon, 28 Apr 2025 18:16:42 +0200 Message-Id: <20250428161643.321617-5-stanislaw.gruszka@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250428161643.321617-1-stanislaw.gruszka@linux.intel.com> References: <20250428161643.321617-1-stanislaw.gruszka@linux.intel.com> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 ipu6_isys_subdev structure will be shared with ipu7, to avoid confusion rename it to ipu_isys_subdev. Signed-off-by: Stanislaw Gruszka --- drivers/media/pci/intel/ipu6/ipu-isys.h | 14 +++++++++++++ drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c | 4 ++-- drivers/media/pci/intel/ipu6/ipu6-isys-csi2.h | 4 +++- .../media/pci/intel/ipu6/ipu6-isys-subdev.c | 8 ++++---- .../media/pci/intel/ipu6/ipu6-isys-subdev.h | 20 ++----------------- .../media/pci/intel/ipu6/ipu6-isys-video.c | 6 +++--- .../media/pci/intel/ipu6/ipu6-isys-video.h | 4 ++-- 7 files changed, 30 insertions(+), 30 deletions(-) diff --git a/drivers/media/pci/intel/ipu6/ipu-isys.h b/drivers/media/pci/intel/ipu6/ipu-isys.h index 52dd0a5a8c8c..c476d9119c1f 100644 --- a/drivers/media/pci/intel/ipu6/ipu-isys.h +++ b/drivers/media/pci/intel/ipu6/ipu-isys.h @@ -4,8 +4,22 @@ #ifndef IPU_ISYS_H #define IPU_ISYS_H +#include + +#include #include +struct ipu_isys_subdev { + struct v4l2_subdev sd; + u32 const *supported_codes; + struct media_pad *pad; + struct v4l2_ctrl_handler ctrl_handler; + void (*ctrl_init)(struct v4l2_subdev *sd); + int source; /* SSI stream source; -1 if unset */ +}; + +#define to_ipu_isys_subdev(__sd) container_of(__sd, struct ipu_isys_subdev, sd) + int ipu_isys_get_stream_pad_fmt(struct v4l2_subdev *sd, u32 pad, u32 stream, struct v4l2_mbus_framefmt *format); int ipu_isys_get_stream_pad_crop(struct v4l2_subdev *sd, u32 pad, u32 stream, diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c b/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c index c8935bf7df31..703a5112ba95 100644 --- a/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c +++ b/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c @@ -224,7 +224,7 @@ static int ipu6_isys_csi2_set_stream(struct v4l2_subdev *sd, const struct ipu6_isys_csi2_timing *timing, unsigned int nlanes, int enable) { - struct ipu6_isys_subdev *asd = to_ipu6_isys_subdev(sd); + struct ipu_isys_subdev *asd = to_ipu_isys_subdev(sd); struct ipu6_isys_csi2 *csi2 = to_ipu6_isys_csi2(asd); struct ipu6_isys *isys = csi2->isys; struct device *dev = &isys->adev->auxdev.dev; @@ -339,7 +339,7 @@ static int ipu6_isys_csi2_enable_streams(struct v4l2_subdev *sd, struct v4l2_subdev_state *state, u32 pad, u64 streams_mask) { - struct ipu6_isys_subdev *asd = to_ipu6_isys_subdev(sd); + struct ipu_isys_subdev *asd = to_ipu_isys_subdev(sd); struct ipu6_isys_csi2 *csi2 = to_ipu6_isys_csi2(asd); struct ipu6_isys_csi2_timing timing = { }; struct v4l2_subdev *remote_sd; diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.h b/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.h index 24ed13b4a63f..24f01eed7e93 100644 --- a/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.h +++ b/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.h @@ -9,6 +9,8 @@ #include "ipu6-isys-subdev.h" #include "ipu6-isys-video.h" +#include "ipu-isys.h" + struct media_entity; struct v4l2_mbus_frame_desc_entry; @@ -35,7 +37,7 @@ struct ipu6_isys_stream; #define CSI2_CSI_RX_DLY_CNT_SETTLE_DLANE_B -2 struct ipu6_isys_csi2 { - struct ipu6_isys_subdev asd; + struct ipu_isys_subdev asd; struct ipu6_isys *isys; struct ipu6_isys_video av[NR_OF_CSI2_SRC_PADS]; diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys-subdev.c b/drivers/media/pci/intel/ipu6/ipu6-isys-subdev.c index 7c6125dc4af4..180eeb6fc981 100644 --- a/drivers/media/pci/intel/ipu6/ipu6-isys-subdev.c +++ b/drivers/media/pci/intel/ipu6/ipu6-isys-subdev.c @@ -141,7 +141,7 @@ int ipu6_isys_subdev_set_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_state *state, struct v4l2_subdev_format *format) { - struct ipu6_isys_subdev *asd = to_ipu6_isys_subdev(sd); + struct ipu_isys_subdev *asd = to_ipu_isys_subdev(sd); struct v4l2_mbus_framefmt *fmt; struct v4l2_rect *crop; u32 code = asd->supported_codes[0]; @@ -209,7 +209,7 @@ int ipu6_isys_subdev_enum_mbus_code(struct v4l2_subdev *sd, struct v4l2_subdev_state *state, struct v4l2_subdev_mbus_code_enum *code) { - struct ipu6_isys_subdev *asd = to_ipu6_isys_subdev(sd); + struct ipu_isys_subdev *asd = to_ipu_isys_subdev(sd); const u32 *supported_codes = asd->supported_codes; u32 index; @@ -265,7 +265,7 @@ static const struct v4l2_subdev_internal_ops ipu6_isys_subdev_internal_ops = { .init_state = ipu6_isys_subdev_init_state, }; -int ipu6_isys_subdev_init(struct ipu6_isys_subdev *asd, struct device *dev, +int ipu6_isys_subdev_init(struct ipu_isys_subdev *asd, struct device *dev, const struct v4l2_subdev_ops *ops, unsigned int nr_ctrls, unsigned int num_sink_pads, unsigned int num_source_pads) @@ -326,7 +326,7 @@ int ipu6_isys_subdev_init(struct ipu6_isys_subdev *asd, struct device *dev, return ret; } -void ipu6_isys_subdev_cleanup(struct ipu6_isys_subdev *asd) +void ipu6_isys_subdev_cleanup(struct ipu_isys_subdev *asd) { media_entity_cleanup(&asd->sd.entity); v4l2_ctrl_handler_free(&asd->ctrl_handler); diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys-subdev.h b/drivers/media/pci/intel/ipu6/ipu6-isys-subdev.h index 732e6ecc927a..a58d2e80f7a2 100644 --- a/drivers/media/pci/intel/ipu6/ipu6-isys-subdev.h +++ b/drivers/media/pci/intel/ipu6/ipu6-isys-subdev.h @@ -4,26 +4,10 @@ #ifndef IPU6_ISYS_SUBDEV_H #define IPU6_ISYS_SUBDEV_H -#include - -#include -#include #include #include "ipu-isys.h" -struct ipu6_isys_subdev { - struct v4l2_subdev sd; - u32 const *supported_codes; - struct media_pad *pad; - struct v4l2_ctrl_handler ctrl_handler; - void (*ctrl_init)(struct v4l2_subdev *sd); - int source; /* SSI stream source; -1 if unset */ -}; - -#define to_ipu6_isys_subdev(__sd) \ - container_of(__sd, struct ipu6_isys_subdev, sd) - unsigned int ipu6_isys_mbus_code_to_bpp(u32 code); unsigned int ipu6_isys_mbus_code_to_mipi(u32 code); bool ipu6_isys_is_bayer_format(u32 code); @@ -36,9 +20,9 @@ int ipu6_isys_subdev_enum_mbus_code(struct v4l2_subdev *sd, struct v4l2_subdev_state *state, struct v4l2_subdev_mbus_code_enum *code); -int ipu6_isys_subdev_init(struct ipu6_isys_subdev *asd, struct device *dev, +int ipu6_isys_subdev_init(struct ipu_isys_subdev *asd, struct device *dev, const struct v4l2_subdev_ops *ops, unsigned int nr_ctrls, unsigned int num_sink_pads, unsigned int num_source_pads); -void ipu6_isys_subdev_cleanup(struct ipu6_isys_subdev *asd); +void ipu6_isys_subdev_cleanup(struct ipu_isys_subdev *asd); #endif /* IPU6_ISYS_SUBDEV_H */ diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys-video.c b/drivers/media/pci/intel/ipu6/ipu6-isys-video.c index c11e62a44fbf..e9705bb077b6 100644 --- a/drivers/media/pci/intel/ipu6/ipu6-isys-video.c +++ b/drivers/media/pci/intel/ipu6/ipu6-isys-video.c @@ -869,7 +869,7 @@ void ipu6_isys_put_stream(struct ipu6_isys_stream *stream) } static struct ipu6_isys_stream * -ipu6_isys_get_stream(struct ipu6_isys_video *av, struct ipu6_isys_subdev *asd) +ipu6_isys_get_stream(struct ipu6_isys_video *av, struct ipu_isys_subdev *asd) { struct ipu6_isys_stream *stream = NULL; struct ipu6_isys *isys = av->isys; @@ -1174,7 +1174,7 @@ int ipu6_isys_setup_video(struct ipu6_isys_video *av, struct v4l2_subdev_route *route = NULL; struct v4l2_subdev_route *r; struct v4l2_subdev_state *state; - struct ipu6_isys_subdev *asd; + struct ipu_isys_subdev *asd; struct v4l2_subdev *remote_sd; struct media_pipeline *pipeline; struct media_pad *source_pad, *remote_pad; @@ -1189,7 +1189,7 @@ int ipu6_isys_setup_video(struct ipu6_isys_video *av, } remote_sd = media_entity_to_v4l2_subdev(remote_pad->entity); - asd = to_ipu6_isys_subdev(remote_sd); + asd = to_ipu_isys_subdev(remote_sd); source_pad = media_pad_remote_pad_first(&remote_pad->entity->pads[0]); if (!source_pad) { dev_dbg(dev, "No external source entity\n"); diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys-video.h b/drivers/media/pci/intel/ipu6/ipu6-isys-video.h index 1d945be2b879..78cf6b8d5211 100644 --- a/drivers/media/pci/intel/ipu6/ipu6-isys-video.h +++ b/drivers/media/pci/intel/ipu6/ipu6-isys-video.h @@ -21,7 +21,7 @@ struct file; struct ipu6_isys; struct ipu6_isys_csi2; -struct ipu6_isys_subdev; +struct ipu_isys_subdev; struct ipu6_isys_pixelformat { u32 pixelformat; @@ -56,7 +56,7 @@ struct ipu6_isys_stream { int stream_source; int stream_handle; unsigned int nr_output_pins; - struct ipu6_isys_subdev *asd; + struct ipu_isys_subdev *asd; int nr_queues; /* Number of capture queues */ int nr_streaming;