shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 18:41:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "media: mc: Add num_links flag to media_pad"

Browse Source 
This reverts commit cff51913c5 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 <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2024-05-20 10:31:24 +00:00
parent 2b84f5edda
commit 501c229a8a
2 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/media/mc/mc-entity.c
View File

@@ -958,9 +958,6 @@ static void __media_entity_remove_link(struct media_entity *entity,
/* Remove the reverse links for a data link. */ /* Remove the reverse links for a data link. */
if ((link->flags & MEDIA_LNK_FL_LINK_TYPE) == MEDIA_LNK_FL_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) if (link->source->entity == entity)
remote = link->sink->entity; remote = link->sink->entity;
else else
@@ -1072,9 +1069,6 @@ media_create_pad_link(struct media_entity *source, u16 source_pad,
sink->num_links++; sink->num_links++;
source->num_links++; source->num_links++;
link->source->num_links++;
link->sink->num_links++;
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(media_create_pad_link); EXPORT_SYMBOL_GPL(media_create_pad_link);

2
include/media/media-entity.h
View File

@@ -205,7 +205,6 @@ enum media_pad_signal_type {
* @graph_obj: Embedded structure containing the media object common data * @graph_obj: Embedded structure containing the media object common data
* @entity: Entity this pad belongs to * @entity: Entity this pad belongs to
* @index: Pad index in the entity pads array, numbered from 0 to n * @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 * @sig_type: Type of the signal inside a media pad
* @flags: Pad flags, as defined in * @flags: Pad flags, as defined in
* :ref:`include/uapi/linux/media.h <media_header>` * :ref:`include/uapi/linux/media.h <media_header>`
@@ -217,7 +216,6 @@ struct media_pad {
struct media_gobj graph_obj; /* must be first field in struct */ struct media_gobj graph_obj; /* must be first field in struct */
struct media_entity *entity; struct media_entity *entity;
u16 index; u16 index;
u16 num_links;
enum media_pad_signal_type sig_type; enum media_pad_signal_type sig_type;
unsigned long flags; unsigned long flags;