Commit c570fb9f authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

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: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 974ea176
...@@ -754,26 +754,22 @@ static u32 vidtv_psi_desc_write_into(struct desc_write_args *args) ...@@ -754,26 +754,22 @@ static u32 vidtv_psi_desc_write_into(struct desc_write_args *args)
} }
static u32 static u32
vidtv_psi_table_header_write_into(struct header_write_args args) vidtv_psi_table_header_write_into(struct header_write_args *args)
{ {
struct psi_write_args psi_args = {}; struct psi_write_args psi_args = {
/* the number of bytes written by this function */ .dest_buf = args->dest_buf,
u32 nbytes = 0; .from = args->h,
.len = sizeof(struct vidtv_psi_table_header),
psi_args.dest_buf = args.dest_buf; .dest_offset = args->dest_offset,
psi_args.from = args.h; .pid = args->pid,
psi_args.len = sizeof(struct vidtv_psi_table_header); .new_psi_section = true,
psi_args.dest_offset = args.dest_offset; .continuity_counter = args->continuity_counter,
psi_args.pid = args.pid; .is_crc = false,
psi_args.new_psi_section = true; .dest_buf_sz = args->dest_buf_sz,
psi_args.continuity_counter = args.continuity_counter; .crc = args->crc,
psi_args.is_crc = false; };
psi_args.dest_buf_sz = args.dest_buf_sz;
psi_args.crc = args.crc;
nbytes += vidtv_psi_ts_psi_write_into(&psi_args);
return nbytes; return vidtv_psi_ts_psi_write_into(&psi_args);
} }
void void
...@@ -985,7 +981,7 @@ u32 vidtv_psi_pat_write_into(struct vidtv_psi_pat_write_args args) ...@@ -985,7 +981,7 @@ u32 vidtv_psi_pat_write_into(struct vidtv_psi_pat_write_args args)
h_args.dest_buf_sz = args.buf_sz; h_args.dest_buf_sz = args.buf_sz;
h_args.crc = &crc; h_args.crc = &crc;
nbytes += vidtv_psi_table_header_write_into(h_args); nbytes += vidtv_psi_table_header_write_into(&h_args);
/* note that the field 'u16 programs' is not really part of the PAT */ /* note that the field 'u16 programs' is not really part of the PAT */
...@@ -1182,7 +1178,7 @@ u32 vidtv_psi_pmt_write_into(struct vidtv_psi_pmt_write_args args) ...@@ -1182,7 +1178,7 @@ u32 vidtv_psi_pmt_write_into(struct vidtv_psi_pmt_write_args args)
h_args.dest_buf_sz = args.buf_sz; h_args.dest_buf_sz = args.buf_sz;
h_args.crc = &crc; h_args.crc = &crc;
nbytes += vidtv_psi_table_header_write_into(h_args); nbytes += vidtv_psi_table_header_write_into(&h_args);
/* write the two bitfields */ /* write the two bitfields */
psi_args.dest_buf = args.buf; psi_args.dest_buf = args.buf;
...@@ -1334,7 +1330,7 @@ u32 vidtv_psi_sdt_write_into(struct vidtv_psi_sdt_write_args args) ...@@ -1334,7 +1330,7 @@ u32 vidtv_psi_sdt_write_into(struct vidtv_psi_sdt_write_args args)
h_args.dest_buf_sz = args.buf_sz; h_args.dest_buf_sz = args.buf_sz;
h_args.crc = &crc; h_args.crc = &crc;
nbytes += vidtv_psi_table_header_write_into(h_args); nbytes += vidtv_psi_table_header_write_into(&h_args);
psi_args.dest_buf = args.buf; psi_args.dest_buf = args.buf;
psi_args.from = &args.sdt->network_id; psi_args.from = &args.sdt->network_id;
...@@ -1670,7 +1666,7 @@ u32 vidtv_psi_nit_write_into(struct vidtv_psi_nit_write_args args) ...@@ -1670,7 +1666,7 @@ u32 vidtv_psi_nit_write_into(struct vidtv_psi_nit_write_args args)
h_args.dest_buf_sz = args.buf_sz; h_args.dest_buf_sz = args.buf_sz;
h_args.crc = &crc; h_args.crc = &crc;
nbytes += vidtv_psi_table_header_write_into(h_args); nbytes += vidtv_psi_table_header_write_into(&h_args);
/* write the bitfield */ /* write the bitfield */
psi_args.dest_buf = args.buf; psi_args.dest_buf = args.buf;
...@@ -1880,7 +1876,7 @@ u32 vidtv_psi_eit_write_into(struct vidtv_psi_eit_write_args args) ...@@ -1880,7 +1876,7 @@ u32 vidtv_psi_eit_write_into(struct vidtv_psi_eit_write_args args)
h_args.dest_buf_sz = args.buf_sz; h_args.dest_buf_sz = args.buf_sz;
h_args.crc = &crc; h_args.crc = &crc;
nbytes += vidtv_psi_table_header_write_into(h_args); nbytes += vidtv_psi_table_header_write_into(&h_args);
psi_args.dest_buf = args.buf; psi_args.dest_buf = args.buf;
psi_args.from = &args.eit->transport_id; psi_args.from = &args.eit->transport_id;
......
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