[PATCH WIP 4/6] media: vidtv: psi: extract descriptor chaining code into a helper

Daniel W. S. Almeida
2020-09-29T03:26:48Z

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: Daniel W. S. Almeida <dwlsalmeida@gmail.com>
---
drivers/media/test-drivers/vidtv/vidtv_psi.c | 49 ++++++--------------
1 file changed, 15 insertions(+), 34 deletions(-)

diff --git a/drivers/media/test-drivers/vidtv/vidtv_psi.c b/drivers/media/test-drivers/vidtv/vidtv_psi.c
index e331fc7d8eef..2cf103057b19 100644
--- a/drivers/media/test-drivers/vidtv/vidtv_psi.c
+++ b/drivers/media/test-drivers/vidtv/vidtv_psi.c
@@ -313,6 +313,16 @@ static u32 table_section_crc32_write_into(struct crc32_write_args args)
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,
enum service_type service_type,
char *service_name,
@@ -346,12 +356,7 @@ struct vidtv_psi_desc_service *vidtv_psi_service_desc_init(struct vidtv_psi_desc
if (provider_name && provider_name_len)
desc->provider_name = kstrdup(provider_name, GFP_KERNEL);

- if (head) {
- while (head->next)
- head = head->next;
-
- head->next = (struct vidtv_psi_desc *)desc;
- }
+ vidtv_psi_desc_chain(head, (struct vidtv_psi_desc *)desc);
return desc;
}

@@ -379,13 +384,7 @@ struct vidtv_psi_desc_registration
additional_ident_info,
additional_info_len);

- if (head) {
- while (head->next)
- head = head->next;
-
- head->next = (struct vidtv_psi_desc *)desc;
- }
-
+ vidtv_psi_desc_chain(head, (struct vidtv_psi_desc *)desc);
return desc;
}

@@ -404,13 +403,7 @@ struct vidtv_psi_desc_network_name
if (network_name && network_name_len)
desc->network_name = kstrdup(network_name, GFP_KERNEL);

- if (head) {
- while (head->next)
- head = head->next;
-
- head->next = (struct vidtv_psi_desc *)desc;
- }
-
+ vidtv_psi_desc_chain(head, (struct vidtv_psi_desc *)desc);
return desc;
}

@@ -448,13 +441,7 @@ struct vidtv_psi_desc_service_list
desc->length = length;
desc->service_list = head_e;

- if (head) {
- while (head->next)
- head = head->next;
-
- head->next = (struct vidtv_psi_desc *)desc;
- }
-
+ vidtv_psi_desc_chain(head, (struct vidtv_psi_desc *)desc);
return desc;
}

@@ -493,13 +480,7 @@ struct vidtv_psi_desc_short_event
if (text && text_len)
desc->text = kstrdup(text, GFP_KERNEL);

- if (head) {
- while (head->next)
- head = head->next;
-
- head->next = (struct vidtv_psi_desc *)desc;
- }
-
+ vidtv_psi_desc_chain(head, (struct vidtv_psi_desc *)desc);
return desc;
}

--
2.28.0