mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-27 12:57:53 +00:00
Code Issues Releases Wiki Activity

media: mc: Rename pad variable to clarify intent

Browse source 
The pad local variable in the media_pipeline_explore_next_link()
function is used to store the pad through which the entity has been
reached. Rename it to origin to reflect that and make the code easier to
read. This will be even more important in subsequent commits when
expanding the function with additional logic.

Cc: stable@vger.kernel.org # 6.1
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
This commit is contained in:
Laurent Pinchart 2024-01-15 00:30:02 +02:00 committed by Hans Verkuil
parent baeddf94aa
commit 9ec9109cf9
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/media/mc/mc-entity.c
View file

@ -605,13 +605,13 @@ static int media_pipeline_explore_next_link(struct media_pipeline *pipe,
struct media_pipeline_walk *walk) struct media_pipeline_walk *walk)
{ {
struct media_pipeline_walk_entry *entry = media_pipeline_walk_top(walk); struct media_pipeline_walk_entry *entry = media_pipeline_walk_top(walk);
struct media_pad *pad; struct media_pad *origin;
struct media_link *link; struct media_link *link;
struct media_pad *local; struct media_pad *local;
struct media_pad *remote; struct media_pad *remote;
int ret; int ret;
pad = entry->pad; origin = entry->pad;
link = list_entry(entry->links, typeof(*link), list); link = list_entry(entry->links, typeof(*link), list);
media_pipeline_walk_pop(walk); media_pipeline_walk_pop(walk);
@ -621,7 +621,7 @@ static int media_pipeline_explore_next_link(struct media_pipeline *pipe,
link->sink->entity->name, link->sink->index); link->sink->entity->name, link->sink->index);
/* Get the local pad and remote pad. */ /* Get the local pad and remote pad. */
if (link->source->entity == pad->entity) { if (link->source->entity == origin->entity) {
local = link->source; local = link->source;
remote = link->sink; remote = link->sink;
} else { } else {
@ -633,8 +633,9 @@ static int media_pipeline_explore_next_link(struct media_pipeline *pipe,
* Skip links that originate from a different pad than the incoming pad * Skip links that originate from a different pad than the incoming pad
* that is not connected internally in the entity to the incoming pad. * that is not connected internally in the entity to the incoming pad.
*/ */
if (pad != local && if (origin != local &&
!media_entity_has_pad_interdep(pad->entity, pad->index, local->index)) { !media_entity_has_pad_interdep(origin->entity, origin->index,
local->index)) {
dev_dbg(walk->mdev->dev, dev_dbg(walk->mdev->dev,
"media pipeline: skipping link (no route)\n"); "media pipeline: skipping link (no route)\n");
return 0; return 0;