From: Sakari Ailus <sakari.ailus@linux.intel.com>
To: linux-media@vger.kernel.org
Cc: hverkuil@xs4all.nl, laurent.pinchart@ideasonboard.com,
tomi.valkeinen@ideasonboard.com, jacopo.mondi@ideasonboard.com,
bingbu.cao@intel.com, hongju.wang@intel.com
Subject: [PATCH 6/6] media: v4l: subdev: Remove stream-unaware sub-device state access
Date: Fri, 13 Oct 2023 13:44:24 +0300 [thread overview]
Message-ID: <20231013104424.404768-7-sakari.ailus@linux.intel.com> (raw)
In-Reply-To: <20231013104424.404768-1-sakari.ailus@linux.intel.com>
Remove stream-unaware sub-device state access functions and macros. These
are no longer used.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
include/media/v4l2-subdev.h | 77 -------------------------------------
1 file changed, 77 deletions(-)
diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
index 90c46bf6e00c..b3ff1a9c8fa1 100644
--- a/include/media/v4l2-subdev.h
+++ b/include/media/v4l2-subdev.h
@@ -1144,83 +1144,6 @@ struct v4l2_subdev_fh {
#define to_v4l2_subdev_fh(fh) \
container_of(fh, struct v4l2_subdev_fh, vfh)
-#if defined(CONFIG_VIDEO_V4L2_SUBDEV_API)
-
-/**
- * v4l2_subdev_get_pad_format - ancillary routine to call
- * &struct v4l2_subdev_pad_config->try_fmt
- *
- * @sd: pointer to &struct v4l2_subdev
- * @state: pointer to &struct v4l2_subdev_state
- * @pad: index of the pad in the &struct v4l2_subdev_state->pads array
- */
-static inline struct v4l2_mbus_framefmt *
-v4l2_subdev_get_pad_format(struct v4l2_subdev *sd,
- struct v4l2_subdev_state *state,
- unsigned int pad)
-{
- if (WARN_ON(!state))
- return NULL;
- if (WARN_ON(pad >= sd->entity.num_pads))
- pad = 0;
- return &state->pads[pad].try_fmt;
-}
-
-/**
- * v4l2_subdev_get_pad_crop - ancillary routine to call
- * &struct v4l2_subdev_pad_config->try_crop
- *
- * @sd: pointer to &struct v4l2_subdev
- * @state: pointer to &struct v4l2_subdev_state.
- * @pad: index of the pad in the &struct v4l2_subdev_state->pads array.
- */
-static inline struct v4l2_rect *
-v4l2_subdev_get_pad_crop(struct v4l2_subdev *sd,
- struct v4l2_subdev_state *state,
- unsigned int pad)
-{
- if (WARN_ON(!state))
- return NULL;
- if (WARN_ON(pad >= sd->entity.num_pads))
- pad = 0;
- return &state->pads[pad].try_crop;
-}
-
-/**
- * v4l2_subdev_get_pad_compose - ancillary routine to call
- * &struct v4l2_subdev_pad_config->try_compose
- *
- * @sd: pointer to &struct v4l2_subdev
- * @state: pointer to &struct v4l2_subdev_state.
- * @pad: index of the pad in the &struct v4l2_subdev_state->pads array.
- */
-static inline struct v4l2_rect *
-v4l2_subdev_get_pad_compose(struct v4l2_subdev *sd,
- struct v4l2_subdev_state *state,
- unsigned int pad)
-{
- if (WARN_ON(!state))
- return NULL;
- if (WARN_ON(pad >= sd->entity.num_pads))
- pad = 0;
- return &state->pads[pad].try_compose;
-}
-
-/*
- * Temprary helpers until uses of v4l2_subdev_get_try_* functions have been
- * renamed
- */
-#define v4l2_subdev_get_try_format(sd, state, pad) \
- v4l2_subdev_get_format(state, pad, 0)
-
-#define v4l2_subdev_get_try_crop(sd, state, pad) \
- v4l2_subdev_get_crop(state, pad, 0)
-
-#define v4l2_subdev_get_try_compose(sd, state, pad) \
- v4l2_subdev_get_compose(state, pad, 0)
-
-#endif /* CONFIG_VIDEO_V4L2_SUBDEV_API */
-
extern const struct v4l2_file_operations v4l2_subdev_fops;
/**
--
2.39.2
prev parent reply other threads:[~2023-10-13 10:44 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-13 10:44 [PATCH 0/6] Unify sub-device state access functions Sakari Ailus
2023-10-13 10:44 ` [PATCH 1/6] media: v4l: subdev: Store the number of pads in sub-device state Sakari Ailus
2023-10-13 10:57 ` Laurent Pinchart
2023-10-13 11:06 ` Sakari Ailus
2023-10-13 11:15 ` Laurent Pinchart
2023-10-13 11:17 ` Sakari Ailus
2023-10-23 8:34 ` Tomi Valkeinen
2023-10-23 11:46 ` Laurent Pinchart
2023-10-13 10:44 ` [PATCH 2/6] media: v4l: subdev: Also return pads array information on stream functions Sakari Ailus
2023-10-13 11:07 ` Laurent Pinchart
2023-10-13 11:13 ` Sakari Ailus
2023-10-16 8:24 ` Laurent Pinchart
2023-10-16 8:59 ` Sakari Ailus
2023-10-16 10:21 ` Sakari Ailus
2023-10-23 11:42 ` Laurent Pinchart
2023-10-13 10:44 ` [PATCH 3/6] media: v4l: subdev: Rename sub-device state information access functions Sakari Ailus
2023-10-13 11:04 ` Laurent Pinchart
2023-10-13 11:09 ` Sakari Ailus
2023-10-13 11:23 ` Laurent Pinchart
2023-10-13 11:33 ` Sakari Ailus
2023-10-16 8:26 ` Laurent Pinchart
2023-10-16 8:58 ` Sakari Ailus
2023-10-17 6:00 ` kernel test robot
2023-10-17 8:22 ` kernel test robot
2023-10-13 10:44 ` [PATCH 4/6] media: v4l: subdev: v4l2_subdev_get_format always returns format now Sakari Ailus
2023-10-13 11:06 ` Laurent Pinchart
2023-10-13 10:44 ` [PATCH 5/6] media: v4l: subdev: Switch to stream-aware state functions Sakari Ailus
2023-10-17 9:17 ` kernel test robot
2023-10-13 10:44 ` Sakari Ailus [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231013104424.404768-7-sakari.ailus@linux.intel.com \
--to=sakari.ailus@linux.intel.com \
--cc=bingbu.cao@intel.com \
--cc=hongju.wang@intel.com \
--cc=hverkuil@xs4all.nl \
--cc=jacopo.mondi@ideasonboard.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-media@vger.kernel.org \
--cc=tomi.valkeinen@ideasonboard.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox