Skip to content

Commit c570fb9

Browse files
committed
media: vidtv: cleanup PSI table header function
- Pass struct header_write_args as a pointer, instead of passing as a var; - Initialize the psi_args struct only once. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
1 parent 974ea17 commit c570fb9

1 file changed

Lines changed: 19 additions & 23 deletions

File tree

drivers/media/test-drivers/vidtv/vidtv_psi.c

Lines changed: 19 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -754,26 +754,22 @@ static u32 vidtv_psi_desc_write_into(struct desc_write_args *args)
754754
}
755755

756756
static u32
757-
vidtv_psi_table_header_write_into(struct header_write_args args)
757+
vidtv_psi_table_header_write_into(struct header_write_args *args)
758758
{
759-
struct psi_write_args psi_args = {};
760-
/* the number of bytes written by this function */
761-
u32 nbytes = 0;
762-
763-
psi_args.dest_buf = args.dest_buf;
764-
psi_args.from = args.h;
765-
psi_args.len = sizeof(struct vidtv_psi_table_header);
766-
psi_args.dest_offset = args.dest_offset;
767-
psi_args.pid = args.pid;
768-
psi_args.new_psi_section = true;
769-
psi_args.continuity_counter = args.continuity_counter;
770-
psi_args.is_crc = false;
771-
psi_args.dest_buf_sz = args.dest_buf_sz;
772-
psi_args.crc = args.crc;
773-
774-
nbytes += vidtv_psi_ts_psi_write_into(&psi_args);
759+
struct psi_write_args psi_args = {
760+
.dest_buf = args->dest_buf,
761+
.from = args->h,
762+
.len = sizeof(struct vidtv_psi_table_header),
763+
.dest_offset = args->dest_offset,
764+
.pid = args->pid,
765+
.new_psi_section = true,
766+
.continuity_counter = args->continuity_counter,
767+
.is_crc = false,
768+
.dest_buf_sz = args->dest_buf_sz,
769+
.crc = args->crc,
770+
};
775771

776-
return nbytes;
772+
return vidtv_psi_ts_psi_write_into(&psi_args);
777773
}
778774

779775
void
@@ -985,7 +981,7 @@ u32 vidtv_psi_pat_write_into(struct vidtv_psi_pat_write_args args)
985981
h_args.dest_buf_sz = args.buf_sz;
986982
h_args.crc = &crc;
987983

988-
nbytes += vidtv_psi_table_header_write_into(h_args);
984+
nbytes += vidtv_psi_table_header_write_into(&h_args);
989985

990986
/* note that the field 'u16 programs' is not really part of the PAT */
991987

@@ -1182,7 +1178,7 @@ u32 vidtv_psi_pmt_write_into(struct vidtv_psi_pmt_write_args args)
11821178
h_args.dest_buf_sz = args.buf_sz;
11831179
h_args.crc = &crc;
11841180

1185-
nbytes += vidtv_psi_table_header_write_into(h_args);
1181+
nbytes += vidtv_psi_table_header_write_into(&h_args);
11861182

11871183
/* write the two bitfields */
11881184
psi_args.dest_buf = args.buf;
@@ -1334,7 +1330,7 @@ u32 vidtv_psi_sdt_write_into(struct vidtv_psi_sdt_write_args args)
13341330
h_args.dest_buf_sz = args.buf_sz;
13351331
h_args.crc = &crc;
13361332

1337-
nbytes += vidtv_psi_table_header_write_into(h_args);
1333+
nbytes += vidtv_psi_table_header_write_into(&h_args);
13381334

13391335
psi_args.dest_buf = args.buf;
13401336
psi_args.from = &args.sdt->network_id;
@@ -1670,7 +1666,7 @@ u32 vidtv_psi_nit_write_into(struct vidtv_psi_nit_write_args args)
16701666
h_args.dest_buf_sz = args.buf_sz;
16711667
h_args.crc = &crc;
16721668

1673-
nbytes += vidtv_psi_table_header_write_into(h_args);
1669+
nbytes += vidtv_psi_table_header_write_into(&h_args);
16741670

16751671
/* write the bitfield */
16761672
psi_args.dest_buf = args.buf;
@@ -1880,7 +1876,7 @@ u32 vidtv_psi_eit_write_into(struct vidtv_psi_eit_write_args args)
18801876
h_args.dest_buf_sz = args.buf_sz;
18811877
h_args.crc = &crc;
18821878

1883-
nbytes += vidtv_psi_table_header_write_into(h_args);
1879+
nbytes += vidtv_psi_table_header_write_into(&h_args);
18841880

18851881
psi_args.dest_buf = args.buf;
18861882
psi_args.from = &args.eit->transport_id;

0 commit comments

Comments
 (0)