Commit 84306c96 authored by Daniel W. S. Almeida's avatar Daniel W. S. Almeida Committed by Mauro Carvalho Chehab

media: vidtv: psi: extract descriptor chaining code into a helper

The code to append a descriptor to the end of a chain is repeated
throughout the psi generator code. Extract it into its own helper
function to avoid cluttering.
Signed-off-by: default avatarDaniel W. S. Almeida <dwlsalmeida@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 7a7899f6
...@@ -314,6 +314,16 @@ static u32 table_section_crc32_write_into(struct crc32_write_args args) ...@@ -314,6 +314,16 @@ static u32 table_section_crc32_write_into(struct crc32_write_args args)
return nbytes; return nbytes;
} }
static void vidtv_psi_desc_chain(struct vidtv_psi_desc *head, struct vidtv_psi_desc *desc)
{
if (head) {
while (head->next)
head = head->next;
head->next = desc;
}
}
struct vidtv_psi_desc_service *vidtv_psi_service_desc_init(struct vidtv_psi_desc *head, struct vidtv_psi_desc_service *vidtv_psi_service_desc_init(struct vidtv_psi_desc *head,
enum service_type service_type, enum service_type service_type,
char *service_name, char *service_name,
...@@ -345,12 +355,7 @@ struct vidtv_psi_desc_service *vidtv_psi_service_desc_init(struct vidtv_psi_desc ...@@ -345,12 +355,7 @@ struct vidtv_psi_desc_service *vidtv_psi_service_desc_init(struct vidtv_psi_desc
if (provider_name && provider_name_len) if (provider_name && provider_name_len)
desc->provider_name = kstrdup(provider_name, GFP_KERNEL); desc->provider_name = kstrdup(provider_name, GFP_KERNEL);
if (head) { vidtv_psi_desc_chain(head, (struct vidtv_psi_desc *)desc);
while (head->next)
head = head->next;
head->next = (struct vidtv_psi_desc *)desc;
}
return desc; return desc;
} }
...@@ -376,13 +381,7 @@ struct vidtv_psi_desc_registration ...@@ -376,13 +381,7 @@ struct vidtv_psi_desc_registration
additional_ident_info, additional_ident_info,
additional_info_len); additional_info_len);
if (head) { vidtv_psi_desc_chain(head, (struct vidtv_psi_desc *)desc);
while (head->next)
head = head->next;
head->next = (struct vidtv_psi_desc *)desc;
}
return desc; return desc;
} }
...@@ -401,13 +400,7 @@ struct vidtv_psi_desc_network_name ...@@ -401,13 +400,7 @@ struct vidtv_psi_desc_network_name
if (network_name && network_name_len) if (network_name && network_name_len)
desc->network_name = kstrdup(network_name, GFP_KERNEL); desc->network_name = kstrdup(network_name, GFP_KERNEL);
if (head) { vidtv_psi_desc_chain(head, (struct vidtv_psi_desc *)desc);
while (head->next)
head = head->next;
head->next = (struct vidtv_psi_desc *)desc;
}
return desc; return desc;
} }
...@@ -445,13 +438,7 @@ struct vidtv_psi_desc_service_list ...@@ -445,13 +438,7 @@ struct vidtv_psi_desc_service_list
desc->length = length; desc->length = length;
desc->service_list = head_e; desc->service_list = head_e;
if (head) { vidtv_psi_desc_chain(head, (struct vidtv_psi_desc *)desc);
while (head->next)
head = head->next;
head->next = (struct vidtv_psi_desc *)desc;
}
return desc; return desc;
} }
...@@ -490,13 +477,7 @@ struct vidtv_psi_desc_short_event ...@@ -490,13 +477,7 @@ struct vidtv_psi_desc_short_event
if (text && text_len) if (text && text_len)
desc->text = kstrdup(text, GFP_KERNEL); desc->text = kstrdup(text, GFP_KERNEL);
if (head) { vidtv_psi_desc_chain(head, (struct vidtv_psi_desc *)desc);
while (head->next)
head = head->next;
head->next = (struct vidtv_psi_desc *)desc;
}
return desc; return desc;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment