[PATCH v3 14/29] media: v4l2-subdev: Make v4l2_subdev_get_frame_desc_passthrough() static
Sakari Ailus <[email protected]>
| Newsgroups | org.kernel.vger.linux-media |
|---|---|
| Organization | Intel Finland Oy - BIC 0357606-4 - c/o Alberga Business Park, 6 krs, Bertel Jungin Aukio 5, 02600 Espoo |
| Message-ID | <[email protected]> |
No driver uses (nor should use) v4l2_subdev_get_frame_desc_passthrough() anymore, make it static. Signed-off-by: Sakari Ailus <[email protected]> --- drivers/media/v4l2-core/v4l2-subdev.c | 8 ++++---- include/media/v4l2-subdev.h | 22 ---------------------- 2 files changed, 4 insertions(+), 26 deletions(-) diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c index f5fa62038754..c9f38b0313eb 100644 --- a/drivers/media/v4l2-core/v4l2-subdev.c +++ b/drivers/media/v4l2-core/v4l2-subdev.c @@ -2655,9 +2655,10 @@ int __v4l2_subdev_get_frame_desc_passthrough(struct v4l2_subdev *sd, } EXPORT_SYMBOL_GPL(__v4l2_subdev_get_frame_desc_passthrough); -int v4l2_subdev_get_frame_desc_passthrough(struct v4l2_subdev *sd, - unsigned int pad, - struct v4l2_mbus_frame_desc *fd) +static int +v4l2_subdev_get_frame_desc_passthrough(struct v4l2_subdev *sd, + unsigned int pad, + struct v4l2_mbus_frame_desc *fd) { struct v4l2_subdev_state *state; int ret; @@ -2670,7 +2671,6 @@ int v4l2_subdev_get_frame_desc_passthrough(struct v4l2_subdev *sd, return ret; } -EXPORT_SYMBOL_GPL(v4l2_subdev_get_frame_desc_passthrough); int v4l2_subdev_get_frame_desc_passthrough_dvp(struct v4l2_subdev *sd, unsigned int pad, diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h index 80ae7649f5c7..cfe285f44f57 100644 --- a/include/media/v4l2-subdev.h +++ b/include/media/v4l2-subdev.h @@ -1773,28 +1773,6 @@ int __v4l2_subdev_get_frame_desc_passthrough(struct v4l2_subdev *sd, unsigned int pad, struct v4l2_mbus_frame_desc *fd); -/** - * v4l2_subdev_get_frame_desc_passthrough() - Helper to implement the subdev - * get_frame_desc operation in simple passthrough cases - * @sd: The subdevice - * @pad: The source pad index - * @fd: The mbus frame desc - * - * This function locks the subdevice's active state, calls - * __v4l2_subdev_get_frame_desc_passthrough(), and unlocks the state. - * - * This function can be assigned directly as the .get_frame_desc callback in - * &v4l2_subdev_pad_ops for subdevices that pass streams through without - * modification. Drivers that need to perform additional work should use - * __v4l2_subdev_get_frame_desc_passthrough() in their custom - * .get_frame_desc implementation instead. - * - * Return: 0 on success, or a negative error code otherwise. - */ -int v4l2_subdev_get_frame_desc_passthrough(struct v4l2_subdev *sd, - unsigned int pad, - struct v4l2_mbus_frame_desc *fd); - /** * v4l2_subdev_get_frame_desc_passthrough_dvp() - Helper to implement the subdev * get_frame_desc operation in simple passthrough cases for DVP -- 2.47.3