From 501c229a8a84b4f31084120cffd0d431ed90f1f0 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 20 May 2024 10:31:24 +0000 Subject: [PATCH] Revert "media: mc: Add num_links flag to media_pad" This reverts commit cff51913c5cc42b45ea010e91eb0c1e349d4292f which is commit baeddf94aa61879b118f2faa37ed126d772670cc upstream. It breaks the Android kernel abi and can be brought back in the future in an abi-safe way if it is really needed. Bug: 161946584 Change-Id: I5b874c8b01bdd8cdeed6dec216fdad500593f5a7 Signed-off-by: Greg Kroah-Hartman --- drivers/media/mc/mc-entity.c | 6 ------ include/media/media-entity.h | 2 -- 2 files changed, 8 deletions(-) diff --git a/drivers/media/mc/mc-entity.c b/drivers/media/mc/mc-entity.c index 50b68b4dde5d..030ef3d71b94 100644 --- a/drivers/media/mc/mc-entity.c +++ b/drivers/media/mc/mc-entity.c @@ -958,9 +958,6 @@ static void __media_entity_remove_link(struct media_entity *entity, /* Remove the reverse links for a data link. */ if ((link->flags & MEDIA_LNK_FL_LINK_TYPE) == MEDIA_LNK_FL_DATA_LINK) { - link->source->num_links--; - link->sink->num_links--; - if (link->source->entity == entity) remote = link->sink->entity; else @@ -1072,9 +1069,6 @@ media_create_pad_link(struct media_entity *source, u16 source_pad, sink->num_links++; source->num_links++; - link->source->num_links++; - link->sink->num_links++; - return 0; } EXPORT_SYMBOL_GPL(media_create_pad_link); diff --git a/include/media/media-entity.h b/include/media/media-entity.h index 03bb0963942b..28c9de8a1f34 100644 --- a/include/media/media-entity.h +++ b/include/media/media-entity.h @@ -205,7 +205,6 @@ enum media_pad_signal_type { * @graph_obj: Embedded structure containing the media object common data * @entity: Entity this pad belongs to * @index: Pad index in the entity pads array, numbered from 0 to n - * @num_links: Number of links connected to this pad * @sig_type: Type of the signal inside a media pad * @flags: Pad flags, as defined in * :ref:`include/uapi/linux/media.h ` @@ -217,7 +216,6 @@ struct media_pad { struct media_gobj graph_obj; /* must be first field in struct */ struct media_entity *entity; u16 index; - u16 num_links; enum media_pad_signal_type sig_type; unsigned long flags;