You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
[media] media: Rename graph and pipeline structs and functions
The media_entity_pipeline_start() and media_entity_pipeline_stop() functions are renamed as media_pipeline_start() and media_pipeline_stop(), respectively. The reason is two-fold: the pipeline struct is, rightly, already called media_pipeline (rather than media_entity_pipeline) and what this really is about is a pipeline. A pipeline consists of entities --- and, well, other objects embedded in these entities. As the pipeline object will be in the future moved from entities to pads in order to support multiple pipelines through a single entity, do the renaming now. Similarly, functions operating on struct media_entity_graph as well as the struct itself are renamed by dropping the "entity_" part from the prefix of the function family and the data structure. The graph traversal which is what the functions are about is not specifically about entities only and will operate on pads for the same reason as the media pipeline. The patch has been generated using the following command: git grep -l media_entity |xargs perl -i -pe ' s/media_entity_pipeline/media_pipeline/g; s/media_entity_graph/media_graph/g' And a few manual edits related to line start alignment and line wrapping. Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
committed by
Mauro Carvalho Chehab
parent
12030f489e
commit
20b8522736
@@ -536,7 +536,7 @@ static int fimc_capture_release(struct file *file)
|
||||
mutex_lock(&fimc->lock);
|
||||
|
||||
if (close && vc->streaming) {
|
||||
media_entity_pipeline_stop(&vc->ve.vdev.entity);
|
||||
media_pipeline_stop(&vc->ve.vdev.entity);
|
||||
vc->streaming = false;
|
||||
}
|
||||
|
||||
@@ -1195,7 +1195,7 @@ static int fimc_cap_streamon(struct file *file, void *priv,
|
||||
if (fimc_capture_active(fimc))
|
||||
return -EBUSY;
|
||||
|
||||
ret = media_entity_pipeline_start(entity, &vc->ve.pipe->mp);
|
||||
ret = media_pipeline_start(entity, &vc->ve.pipe->mp);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
@@ -1229,7 +1229,7 @@ static int fimc_cap_streamon(struct file *file, void *priv,
|
||||
}
|
||||
|
||||
err_p_stop:
|
||||
media_entity_pipeline_stop(entity);
|
||||
media_pipeline_stop(entity);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -1244,7 +1244,7 @@ static int fimc_cap_streamoff(struct file *file, void *priv,
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
media_entity_pipeline_stop(&vc->ve.vdev.entity);
|
||||
media_pipeline_stop(&vc->ve.vdev.entity);
|
||||
vc->streaming = false;
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -312,7 +312,7 @@ static int isp_video_release(struct file *file)
|
||||
mutex_lock(&isp->video_lock);
|
||||
|
||||
if (v4l2_fh_is_singular_file(file) && ivc->streaming) {
|
||||
media_entity_pipeline_stop(entity);
|
||||
media_pipeline_stop(entity);
|
||||
ivc->streaming = 0;
|
||||
}
|
||||
|
||||
@@ -489,7 +489,7 @@ static int isp_video_streamon(struct file *file, void *priv,
|
||||
struct media_entity *me = &ve->vdev.entity;
|
||||
int ret;
|
||||
|
||||
ret = media_entity_pipeline_start(me, &ve->pipe->mp);
|
||||
ret = media_pipeline_start(me, &ve->pipe->mp);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
@@ -504,7 +504,7 @@ static int isp_video_streamon(struct file *file, void *priv,
|
||||
isp->video_capture.streaming = 1;
|
||||
return 0;
|
||||
p_stop:
|
||||
media_entity_pipeline_stop(me);
|
||||
media_pipeline_stop(me);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -519,7 +519,7 @@ static int isp_video_streamoff(struct file *file, void *priv,
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
media_entity_pipeline_stop(&video->ve.vdev.entity);
|
||||
media_pipeline_stop(&video->ve.vdev.entity);
|
||||
video->streaming = 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -524,7 +524,7 @@ static int fimc_lite_release(struct file *file)
|
||||
if (v4l2_fh_is_singular_file(file) &&
|
||||
atomic_read(&fimc->out_path) == FIMC_IO_DMA) {
|
||||
if (fimc->streaming) {
|
||||
media_entity_pipeline_stop(entity);
|
||||
media_pipeline_stop(entity);
|
||||
fimc->streaming = false;
|
||||
}
|
||||
fimc_lite_stop_capture(fimc, false);
|
||||
@@ -832,7 +832,7 @@ static int fimc_lite_streamon(struct file *file, void *priv,
|
||||
if (fimc_lite_active(fimc))
|
||||
return -EBUSY;
|
||||
|
||||
ret = media_entity_pipeline_start(entity, &fimc->ve.pipe->mp);
|
||||
ret = media_pipeline_start(entity, &fimc->ve.pipe->mp);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
@@ -849,7 +849,7 @@ static int fimc_lite_streamon(struct file *file, void *priv,
|
||||
}
|
||||
|
||||
err_p_stop:
|
||||
media_entity_pipeline_stop(entity);
|
||||
media_pipeline_stop(entity);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -863,7 +863,7 @@ static int fimc_lite_streamoff(struct file *file, void *priv,
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
media_entity_pipeline_stop(&fimc->ve.vdev.entity);
|
||||
media_pipeline_stop(&fimc->ve.vdev.entity);
|
||||
fimc->streaming = false;
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -1117,7 +1117,7 @@ static int __fimc_md_modify_pipeline(struct media_entity *entity, bool enable)
|
||||
|
||||
/* Locking: called with entity->graph_obj.mdev->graph_mutex mutex held. */
|
||||
static int __fimc_md_modify_pipelines(struct media_entity *entity, bool enable,
|
||||
struct media_entity_graph *graph)
|
||||
struct media_graph *graph)
|
||||
{
|
||||
struct media_entity *entity_err = entity;
|
||||
int ret;
|
||||
@@ -1128,9 +1128,9 @@ static int __fimc_md_modify_pipelines(struct media_entity *entity, bool enable,
|
||||
* through active links. This is needed as we cannot power on/off the
|
||||
* subdevs in random order.
|
||||
*/
|
||||
media_entity_graph_walk_start(graph, entity);
|
||||
media_graph_walk_start(graph, entity);
|
||||
|
||||
while ((entity = media_entity_graph_walk_next(graph))) {
|
||||
while ((entity = media_graph_walk_next(graph))) {
|
||||
if (!is_media_entity_v4l2_video_device(entity))
|
||||
continue;
|
||||
|
||||
@@ -1143,9 +1143,9 @@ static int __fimc_md_modify_pipelines(struct media_entity *entity, bool enable,
|
||||
return 0;
|
||||
|
||||
err:
|
||||
media_entity_graph_walk_start(graph, entity_err);
|
||||
media_graph_walk_start(graph, entity_err);
|
||||
|
||||
while ((entity_err = media_entity_graph_walk_next(graph))) {
|
||||
while ((entity_err = media_graph_walk_next(graph))) {
|
||||
if (!is_media_entity_v4l2_video_device(entity_err))
|
||||
continue;
|
||||
|
||||
@@ -1161,7 +1161,7 @@ err:
|
||||
static int fimc_md_link_notify(struct media_link *link, unsigned int flags,
|
||||
unsigned int notification)
|
||||
{
|
||||
struct media_entity_graph *graph =
|
||||
struct media_graph *graph =
|
||||
&container_of(link->graph_obj.mdev, struct fimc_md,
|
||||
media_dev)->link_setup_graph;
|
||||
struct media_entity *sink = link->sink->entity;
|
||||
@@ -1169,7 +1169,7 @@ static int fimc_md_link_notify(struct media_link *link, unsigned int flags,
|
||||
|
||||
/* Before link disconnection */
|
||||
if (notification == MEDIA_DEV_NOTIFY_PRE_LINK_CH) {
|
||||
ret = media_entity_graph_walk_init(graph,
|
||||
ret = media_graph_walk_init(graph,
|
||||
link->graph_obj.mdev);
|
||||
if (ret)
|
||||
return ret;
|
||||
@@ -1183,7 +1183,7 @@ static int fimc_md_link_notify(struct media_link *link, unsigned int flags,
|
||||
} else if (notification == MEDIA_DEV_NOTIFY_POST_LINK_CH) {
|
||||
if (link->flags & MEDIA_LNK_FL_ENABLED)
|
||||
ret = __fimc_md_modify_pipelines(sink, true, graph);
|
||||
media_entity_graph_walk_cleanup(graph);
|
||||
media_graph_walk_cleanup(graph);
|
||||
}
|
||||
|
||||
return ret ? -EPIPE : 0;
|
||||
|
||||
@@ -154,7 +154,7 @@ struct fimc_md {
|
||||
bool user_subdev_api;
|
||||
spinlock_t slock;
|
||||
struct list_head pipelines;
|
||||
struct media_entity_graph link_setup_graph;
|
||||
struct media_graph link_setup_graph;
|
||||
};
|
||||
|
||||
static inline
|
||||
|
||||
Reference in New Issue
Block a user