media: mc: Rename pad as origin in __media_pipeline_start()
Subsystems (2)
Sakari Ailus
maintainerPATCH v2 1/1 media: mc: Rename pad as origin in __media_pipeline_start()
Rename the pad field in __media_pipeline_start() to both better describe what it is and avoid masking it during the loop.
---
since v1:
- Also change the argument name in the prototype.
drivers/media/mc/mc-entity.c | 8 ++++---- include/media/media-entity.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-)
drivers/media/mc/mc-entity.c +4 -4
@@ -768,10 +768,10 @@ static int media_pipeline_populate(struct media_pipeline *pipe,return ret; } -__must_check int __media_pipeline_start (struct media_pad *pad, +__must_check int __media_pipeline_start (struct media_pad *origin,struct media_pipeline *pipe) { -struct media_device *mdev = pad->graph_obj.mdev; +struct media_device *mdev = origin->graph_obj.mdev;struct media_pipeline_pad *err_ppad;struct media_pipeline_pad *ppad;int ret;
@@ -782,7 +782,7 @@ __must_check int __media_pipeline_start(struct media_pad *pad,* If the pad is already part of a pipeline, that pipeline must be the * same as the pipe given to media_pipeline_start(). */ -if (WARN_ON (pad->pipe && pad->pipe != pipe)) +if (WARN_ON (origin->pipe && origin->pipe != pipe))return -EINVAL ;/*
@@ -799,7 +799,7 @@ __must_check int __media_pipeline_start(struct media_pad *pad,* with media_pipeline_pad instances for each pad found during graph * walk. */ - ret =media_pipeline_populate (pipe, pad); + ret =media_pipeline_populate (pipe, origin);if (ret)return ret;
include/media/media-entity.h +2 -2
@@ -1143,7 +1143,7 @@ struct media_entity *media_graph_walk_next(struct media_graph *graph);/** * media_pipeline_start - Mark a pipeline as streaming -* @pad: Starting pad +* @origin: Starting pad * @pipe: Media pipeline to be assigned to all pads in the pipeline. * * Mark all pads connected to a given pad through enabled links, either
@@ -1155,7 +1155,7 @@ struct media_entity *media_graph_walk_next(struct media_graph *graph);* pipeline pointer must be identical for all nested calls to * media_pipeline_start(). */ -__must_check int media_pipeline_start (struct media_pad *pad, +__must_check int media_pipeline_start (struct media_pad *origin,struct media_pipeline *pipe);/** * __media_pipeline_start - Mark a pipeline as streaming
Signature · 1 line
2.39.5
Laurent Pinchart
maintainerHi Sakari,
Thank you for the patch.
Quoted 54 lines · Sakari Ailus
Rename the pad field in
__media_pipeline_start()to both better describe what it is and avoid masking it during the loop.Signed-off-by Sakari Ailus <[email protected]>Reviewed-by Laurent Pinchart <[email protected]>---
since v1:- Also change the argument name in the prototype.
drivers/media/mc/mc-entity.c | 8 ++++---- include/media/media-entity.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-)drivers/media/mc/mc-entity.c +4
-4@@ -768,10 +768,10 @@ static int media_pipeline_populate(struct media_pipeline *pipe,return ret; } -__must_check int __media_pipeline_start (struct media_pad *pad, +__must_check int __media_pipeline_start (struct media_pad *origin,struct media_pipeline *pipe) { -struct media_device *mdev = pad->graph_obj.mdev; +struct media_device *mdev = origin->graph_obj.mdev;struct media_pipeline_pad *err_ppad;struct media_pipeline_pad *ppad;int ret;@@ -782,7 +782,7 @@ __must_check int __media_pipeline_start(struct media_pad *pad,* If the pad is already part of a pipeline, that pipeline must be the * same as the pipe given to media_pipeline_start(). */ -if (WARN_ON (pad->pipe && pad->pipe != pipe)) +if (WARN_ON (origin->pipe && origin->pipe != pipe))return -EINVAL ;/* @@ -799,7 +799,7 @@ __must_check int __media_pipeline_start(struct media_pad *pad,* with media_pipeline_pad instances for each pad found during graph * walk. */ - ret =media_pipeline_populate (pipe, pad); + ret =media_pipeline_populate (pipe, origin);if (ret)return ret;include/media/media-entity.h +0
-0
include/media/media-entity.h struct media_entity *media_graph_walk_next(struct media_graph *graph); · line 1149
Quoted 8 lines
include/media/media-entity.h +1
-1@@ -1143,7 +1143,7 @@ struct media_entity *media_graph_walk_next(struct media_graph *graph);/** * media_pipeline_start - Mark a pipeline as streaming -* @pad: Starting pad +* @origin: Starting pad * @pipe: Media pipeline to be assigned to all pads in the pipeline. * * Mark all pads connected to a given pad through enabled links, either
s/to a given pad/to the given @starting pad/
include/media/media-entity.h struct media_entity *media_graph_walk_next(struct media_graph *graph); · line 1161
Quoted 9 lines
include/media/media-entity.h +1
-1@@ -1155,7 +1155,7 @@ struct media_entity *media_graph_walk_next(struct media_graph *graph);* pipeline pointer must be identical for all nested calls to * media_pipeline_start(). */ -__must_check int media_pipeline_start (struct media_pad *pad, +__must_check int media_pipeline_start (struct media_pad *origin,struct media_pipeline *pipe);/** * __media_pipeline_start - Mark a pipeline as streaming
The documentation for __media_pipeline_start needs a similar update.
Signature · 3 lines
Regards, Laurent Pinchart
Sakari Ailus
maintainerHi Laurent,
Thanks for the review.
Quoted 60 lines · Laurent Pinchart
Hi Sakari,
Thank you for the patch.
Quoted 55 lines · Sakari Ailus
Rename the pad field in
__media_pipeline_start()to both better describe what it is and avoid masking it during the loop.Signed-off-by Sakari Ailus <[email protected]>Reviewed-by Laurent Pinchart <[email protected]>---
since v1:- Also change the argument name in the prototype.
drivers/media/mc/mc-entity.c | 8 ++++---- include/media/media-entity.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-)drivers/media/mc/mc-entity.c +4
-4@@ -768,10 +768,10 @@ static int media_pipeline_populate(struct media_pipeline *pipe,return ret; } -__must_check int __media_pipeline_start (struct media_pad *pad, +__must_check int __media_pipeline_start (struct media_pad *origin,struct media_pipeline *pipe) { -struct media_device *mdev = pad->graph_obj.mdev; +struct media_device *mdev = origin->graph_obj.mdev;struct media_pipeline_pad *err_ppad;struct media_pipeline_pad *ppad;int ret;@@ -782,7 +782,7 @@ __must_check int __media_pipeline_start(struct media_pad *pad,* If the pad is already part of a pipeline, that pipeline must be the * same as the pipe given to media_pipeline_start(). */ -if (WARN_ON (pad->pipe && pad->pipe != pipe)) +if (WARN_ON (origin->pipe && origin->pipe != pipe))return -EINVAL ;/* @@ -799,7 +799,7 @@ __must_check int __media_pipeline_start(struct media_pad *pad,* with media_pipeline_pad instances for each pad found during graph * walk. */ - ret =media_pipeline_populate (pipe, pad); + ret =media_pipeline_populate (pipe, origin);if (ret)return ret;include/media/media-entity.h +0
-0@@ -1143,7 +1143,7 @@ struct media_entity *media_graph_walk_next(struct media_graph *graph);
Quoted 9 lines
include/media/media-entity.h struct media_entity *media_graph_walk_next(struct media_graph *graph); · line 1149
Quoted 7 lines
include/media/media-entity.h +1
-1/** * media_pipeline_start - Mark a pipeline as streaming -* @pad: Starting pad +* @origin: Starting pad * @pipe: Media pipeline to be assigned to all pads in the pipeline. * * Mark all pads connected to a given pad through enabled links, either s/to a given pad/to the given @starting pad/
s/to a given pad/@origin pad/
?
Quoted 12 lines
include/media/media-entity.h struct media_entity *media_graph_walk_next(struct media_graph *graph); · line 1161
Quoted 10 lines
include/media/media-entity.h +1
-1@@ -1155,7 +1155,7 @@ struct media_entity *media_graph_walk_next(struct media_graph *graph);* pipeline pointer must be identical for all nested calls to * media_pipeline_start(). */ -__must_check int media_pipeline_start (struct media_pad *pad, +__must_check int media_pipeline_start (struct media_pad *origin,struct media_pipeline *pipe);/** * __media_pipeline_start - Mark a pipeline as streaming The documentation for
__media_pipeline_startneeds a similar update.
Too many similarly named functions. :-P
I'll address this in v3.
Signature · 3 lines
Regards, Sakari Ailus
Laurent Pinchart
maintainerQuoted 75 lines · Sakari Ailus
Hi Laurent,
Thanks for the review.
Quoted 60 lines · Laurent Pinchart
Hi Sakari,
Thank you for the patch.
Quoted 55 lines · Sakari Ailus
Rename the pad field in
__media_pipeline_start()to both better describe what it is and avoid masking it during the loop.Signed-off-by Sakari Ailus <[email protected]>Reviewed-by Laurent Pinchart <[email protected]>---
since v1:- Also change the argument name in the prototype.
drivers/media/mc/mc-entity.c | 8 ++++---- include/media/media-entity.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-)drivers/media/mc/mc-entity.c +4
-4@@ -768,10 +768,10 @@ static int media_pipeline_populate(struct media_pipeline *pipe,return ret; } -__must_check int __media_pipeline_start (struct media_pad *pad, +__must_check int __media_pipeline_start (struct media_pad *origin,struct media_pipeline *pipe) { -struct media_device *mdev = pad->graph_obj.mdev; +struct media_device *mdev = origin->graph_obj.mdev;struct media_pipeline_pad *err_ppad;struct media_pipeline_pad *ppad;int ret;@@ -782,7 +782,7 @@ __must_check int __media_pipeline_start(struct media_pad *pad,* If the pad is already part of a pipeline, that pipeline must be the * same as the pipe given to media_pipeline_start(). */ -if (WARN_ON (pad->pipe && pad->pipe != pipe)) +if (WARN_ON (origin->pipe && origin->pipe != pipe))return -EINVAL ;/* @@ -799,7 +799,7 @@ __must_check int __media_pipeline_start(struct media_pad *pad,* with media_pipeline_pad instances for each pad found during graph * walk. */ - ret =media_pipeline_populate (pipe, pad); + ret =media_pipeline_populate (pipe, origin);if (ret)return ret;include/media/media-entity.h +0
-0@@ -1143,7 +1143,7 @@ struct media_entity *media_graph_walk_next(struct media_graph *graph);Quoted 9 lines
include/media/media-entity.h struct media_entity *media_graph_walk_next(struct media_graph *graph); · line 1149
Quoted 7 lines
include/media/media-entity.h +1
-1/** * media_pipeline_start - Mark a pipeline as streaming -* @pad: Starting pad +* @origin: Starting pad * @pipe: Media pipeline to be assigned to all pads in the pipeline. * * Mark all pads connected to a given pad through enabled links, either s/to a given pad/to the given @starting pad/
Quoted 3 lines
s/to a given pad/@origin pad/
?
I meant
* Mark all pads connected to the given @starting pad through enabled links,
Quoted 15 lines
Quoted 11 lines
include/media/media-entity.h struct media_entity *media_graph_walk_next(struct media_graph *graph); · line 1161
Quoted 9 lines
include/media/media-entity.h +1
-1@@ -1155,7 +1155,7 @@ struct media_entity *media_graph_walk_next(struct media_graph *graph);* pipeline pointer must be identical for all nested calls to * media_pipeline_start(). */ -__must_check int media_pipeline_start (struct media_pad *pad, +__must_check int media_pipeline_start (struct media_pad *origin,struct media_pipeline *pipe);/** * __media_pipeline_start - Mark a pipeline as streaming The documentation for
__media_pipeline_startneeds a similar update.Too many similarly named functions. :-P
I'll address this in v3.
Signature · 3 lines
Regards, Laurent Pinchart
Sakari Ailus
maintainerQuoted 76 lines · Laurent Pinchart
Quoted 75 lines · Sakari Ailus
Hi Laurent,
Thanks for the review.
Quoted 69 lines · Laurent Pinchart
Hi Sakari,
Thank you for the patch.
Quoted 54 lines · Sakari Ailus
Rename the pad field in
__media_pipeline_start()to both better describe what it is and avoid masking it during the loop.Signed-off-by Sakari Ailus <[email protected]>Reviewed-by Laurent Pinchart <[email protected]>---
since v1:- Also change the argument name in the prototype.
drivers/media/mc/mc-entity.c | 8 ++++---- include/media/media-entity.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-)drivers/media/mc/mc-entity.c +4
-4@@ -768,10 +768,10 @@ static int media_pipeline_populate(struct media_pipeline *pipe,return ret; } -__must_check int __media_pipeline_start (struct media_pad *pad, +__must_check int __media_pipeline_start (struct media_pad *origin,struct media_pipeline *pipe) { -struct media_device *mdev = pad->graph_obj.mdev; +struct media_device *mdev = origin->graph_obj.mdev;struct media_pipeline_pad *err_ppad;struct media_pipeline_pad *ppad;int ret;@@ -782,7 +782,7 @@ __must_check int __media_pipeline_start(struct media_pad *pad,* If the pad is already part of a pipeline, that pipeline must be the * same as the pipe given to media_pipeline_start(). */ -if (WARN_ON (pad->pipe && pad->pipe != pipe)) +if (WARN_ON (origin->pipe && origin->pipe != pipe))return -EINVAL ;/* @@ -799,7 +799,7 @@ __must_check int __media_pipeline_start(struct media_pad *pad,* with media_pipeline_pad instances for each pad found during graph * walk. */ - ret =media_pipeline_populate (pipe, pad); + ret =media_pipeline_populate (pipe, origin);if (ret)return ret;include/media/media-entity.h +0
-0include/media/media-entity.h struct media_entity *media_graph_walk_next(struct media_graph *graph); · line 1149
Quoted 8 lines
include/media/media-entity.h +1
-1@@ -1143,7 +1143,7 @@ struct media_entity *media_graph_walk_next(struct media_graph *graph);/** * media_pipeline_start - Mark a pipeline as streaming -* @pad: Starting pad +* @origin: Starting pad * @pipe: Media pipeline to be assigned to all pads in the pipeline. * * Mark all pads connected to a given pad through enabled links, either s/to a given pad/to the given @starting pad/
Quoted 7 lines
Quoted 3 lines
s/to a given pad/@origin pad/
?
I meant
* Mark all pads connected to the given @starting pad through enabled links,
There's no "starting" among the arguments.
Quoted 17 lines
Quoted 16 lines
Quoted 12 lines
include/media/media-entity.h struct media_entity *media_graph_walk_next(struct media_graph *graph); · line 1161
Quoted 10 lines
include/media/media-entity.h +1
-1@@ -1155,7 +1155,7 @@ struct media_entity *media_graph_walk_next(struct media_graph *graph);* pipeline pointer must be identical for all nested calls to * media_pipeline_start(). */ -__must_check int media_pipeline_start (struct media_pad *pad, +__must_check int media_pipeline_start (struct media_pad *origin,struct media_pipeline *pipe);/** * __media_pipeline_start - Mark a pipeline as streaming The documentation for
__media_pipeline_startneeds a similar update.Too many similarly named functions. :-P
I'll address this in v3.
Signature · 1 line
Sakari Ailus
Laurent Pinchart
maintainerQuoted 71 lines · Sakari Ailus
Quoted 70 lines · Laurent Pinchart
Quoted 69 lines · Sakari Ailus
Quoted 56 lines · Laurent Pinchart
Quoted 55 lines · Sakari Ailus
Rename the pad field in
__media_pipeline_start()to both better describe what it is and avoid masking it during the loop.Signed-off-by Sakari Ailus <[email protected]>Reviewed-by Laurent Pinchart <[email protected]>---
since v1:- Also change the argument name in the prototype.
drivers/media/mc/mc-entity.c | 8 ++++---- include/media/media-entity.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-)drivers/media/mc/mc-entity.c +4
-4@@ -768,10 +768,10 @@ static int media_pipeline_populate(struct media_pipeline *pipe,return ret; } -__must_check int __media_pipeline_start (struct media_pad *pad, +__must_check int __media_pipeline_start (struct media_pad *origin,struct media_pipeline *pipe) { -struct media_device *mdev = pad->graph_obj.mdev; +struct media_device *mdev = origin->graph_obj.mdev;struct media_pipeline_pad *err_ppad;struct media_pipeline_pad *ppad;int ret;@@ -782,7 +782,7 @@ __must_check int __media_pipeline_start(struct media_pad *pad,* If the pad is already part of a pipeline, that pipeline must be the * same as the pipe given to media_pipeline_start(). */ -if (WARN_ON (pad->pipe && pad->pipe != pipe)) +if (WARN_ON (origin->pipe && origin->pipe != pipe))return -EINVAL ;/* @@ -799,7 +799,7 @@ __must_check int __media_pipeline_start(struct media_pad *pad,* with media_pipeline_pad instances for each pad found during graph * walk. */ - ret =media_pipeline_populate (pipe, pad); + ret =media_pipeline_populate (pipe, origin);if (ret)return ret;include/media/media-entity.h +0
-0@@ -1143,7 +1143,7 @@ struct media_entity *media_graph_walk_next(struct media_graph *graph);Quoted 9 lines
include/media/media-entity.h struct media_entity *media_graph_walk_next(struct media_graph *graph); · line 1149
Quoted 7 lines
include/media/media-entity.h +1
-1/** * media_pipeline_start - Mark a pipeline as streaming -* @pad: Starting pad +* @origin: Starting pad * @pipe: Media pipeline to be assigned to all pads in the pipeline. * * Mark all pads connected to a given pad through enabled links, either s/to a given pad/to the given @starting pad/
s/to a given pad/@origin pad/
Quoted 7 lines
Quoted 5 lines
Quoted 1 line
?
I meant
* Mark all pads connected to the given @starting pad through enabled links,
There's no "starting" among the arguments.
Seems I need to wake up.
* Mark all pads connected to the given @origin pad through enabled links,
Quoted 15 lines
Quoted 15 lines
Quoted 15 lines
Quoted 11 lines
include/media/media-entity.h struct media_entity *media_graph_walk_next(struct media_graph *graph); · line 1161
Quoted 9 lines
include/media/media-entity.h +1
-1@@ -1155,7 +1155,7 @@ struct media_entity *media_graph_walk_next(struct media_graph *graph);* pipeline pointer must be identical for all nested calls to * media_pipeline_start(). */ -__must_check int media_pipeline_start (struct media_pad *pad, +__must_check int media_pipeline_start (struct media_pad *origin,struct media_pipeline *pipe);/** * __media_pipeline_start - Mark a pipeline as streaming The documentation for
__media_pipeline_startneeds a similar update.Too many similarly named functions. :-P
I'll address this in v3.
Signature · 3 lines
Regards, Laurent Pinchart
Sakari Ailus
maintainerQuoted 74 lines · Laurent Pinchart
Quoted 73 lines · Sakari Ailus
Quoted 72 lines · Laurent Pinchart
Quoted 70 lines · Sakari Ailus
Quoted 56 lines · Laurent Pinchart
Quoted 55 lines · Sakari Ailus
Rename the pad field in
__media_pipeline_start()to both better describe what it is and avoid masking it during the loop.Signed-off-by Sakari Ailus <[email protected]>Reviewed-by Laurent Pinchart <[email protected]>---
since v1:- Also change the argument name in the prototype.
drivers/media/mc/mc-entity.c | 8 ++++---- include/media/media-entity.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-)drivers/media/mc/mc-entity.c +4
-4@@ -768,10 +768,10 @@ static int media_pipeline_populate(struct media_pipeline *pipe,return ret; } -__must_check int __media_pipeline_start (struct media_pad *pad, +__must_check int __media_pipeline_start (struct media_pad *origin,struct media_pipeline *pipe) { -struct media_device *mdev = pad->graph_obj.mdev; +struct media_device *mdev = origin->graph_obj.mdev;struct media_pipeline_pad *err_ppad;struct media_pipeline_pad *ppad;int ret;@@ -782,7 +782,7 @@ __must_check int __media_pipeline_start(struct media_pad *pad,* If the pad is already part of a pipeline, that pipeline must be the * same as the pipe given to media_pipeline_start(). */ -if (WARN_ON (pad->pipe && pad->pipe != pipe)) +if (WARN_ON (origin->pipe && origin->pipe != pipe))return -EINVAL ;/* @@ -799,7 +799,7 @@ __must_check int __media_pipeline_start(struct media_pad *pad,* with media_pipeline_pad instances for each pad found during graph * walk. */ - ret =media_pipeline_populate (pipe, pad); + ret =media_pipeline_populate (pipe, origin);if (ret)return ret;include/media/media-entity.h +0
-0@@ -1143,7 +1143,7 @@ struct media_entity *media_graph_walk_next(struct media_graph *graph);Quoted 9 lines
include/media/media-entity.h struct media_entity *media_graph_walk_next(struct media_graph *graph); · line 1149
Quoted 7 lines
include/media/media-entity.h +1
-1/** * media_pipeline_start - Mark a pipeline as streaming -* @pad: Starting pad +* @origin: Starting pad * @pipe: Media pipeline to be assigned to all pads in the pipeline. * * Mark all pads connected to a given pad through enabled links, either s/to a given pad/to the given @starting pad/
s/to a given pad/@origin pad/
?
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
I meant
* Mark all pads connected to the given @starting pad through enabled links,
There's no "starting" among the arguments.
Seems I need to wake up.
I thought so. ;-)
Quoted 2 lines
* Mark all pads connected to the given @origin pad through enabled links,
The pad is specified here so there's no need for "the given".
Quoted 17 lines
Quoted 16 lines
Quoted 16 lines
Quoted 16 lines
Quoted 12 lines
include/media/media-entity.h struct media_entity *media_graph_walk_next(struct media_graph *graph); · line 1161
Quoted 10 lines
include/media/media-entity.h +1
-1@@ -1155,7 +1155,7 @@ struct media_entity *media_graph_walk_next(struct media_graph *graph);* pipeline pointer must be identical for all nested calls to * media_pipeline_start(). */ -__must_check int media_pipeline_start (struct media_pad *pad, +__must_check int media_pipeline_start (struct media_pad *origin,struct media_pipeline *pipe);/** * __media_pipeline_start - Mark a pipeline as streaming The documentation for
__media_pipeline_startneeds a similar update.Too many similarly named functions. :-P
I'll address this in v3.
Signature · 1 line
Sakari Ailus