From nobody Sun May 11 22:29:46 2025 Delivered-To: importer2@patchew.org Received-SPF: pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; envelope-from=linux-kernel-owner@vger.kernel.org; helo=vger.kernel.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass(p=none dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1606216039; cv=none; d=zohomail.com; s=zohoarc; b=Iz2VgDnCrmGbhsQDe2mjwSl4nosF7JeQg4MNR8v+II+PDf6+uUA47gsCmO2eZMdU4BsnMSimVbnw7pclttLTXSmxsnoxuIBJL/iGxRSWl+njqCUnDJTu+v4KLMyQP3FnkNJiXPYm6EW5FByX/wv737/NcMB+HSNHKDX9oE6ruJ8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606216039; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=OTKGhfLCZmsZvjoep92IL15CC3xkk2DzwL3twjN+en0=; b=DpMWcm8VxIHXf2f6fC3U9022tqIdYswQtgtZgCuLMhM9p7IQmN99relkRzZ8+0I1BkBQuVg/Hgzam+K0FlH8NuN8kme8qSVVQz+4JIGbb/RZxJmq4BV8io/XJWL4VOSKA5HvJ4g129Fobjai4L3xBvKvKlOWyouXanR6nadrxSo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mx.zohomail.com with SMTP id 1606216039553892.3476697424712; Tue, 24 Nov 2020 03:07:19 -0800 (PST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732571AbgKXLGj (ORCPT ); Tue, 24 Nov 2020 06:06:39 -0500 Received: from mail.kernel.org ([198.145.29.99]:33824 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732514AbgKXLGh (ORCPT ); Tue, 24 Nov 2020 06:06:37 -0500 Received: from mail.kernel.org (ip5f5ad5c3.dynamic.kabel-deutschland.de [95.90.213.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3E44122282; Tue, 24 Nov 2020 11:06:32 +0000 (UTC) Received: from mchehab by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1khW9V-000FaY-Ak; Tue, 24 Nov 2020 12:06:29 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1606215992; bh=0lzPZWa/Ly6q42aPW60arn5qeGKLjHWRYYiTE3f4x2c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XkKqBNT6jzJ3cdNL1l+dKxUGWQzjvuaExliZ+0Z7kCfAS9nT0qxjBm3+fKmUE43LG HT64VwPuPQEkAqLee5hAnvjiJfFEBvzP+t+cO3G1vNXGcAnHdH/xgyX8ld2RYAT0tm e2PNmOimDhqH907361iF6jtSVSsA50yZrodn6i2U= From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , "Daniel W. S. Almeida" , Mauro Carvalho Chehab , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH 27/31] media: vidtv: simplify NIT write function Date: Tue, 24 Nov 2020 12:06:23 +0100 Message-Id: <35df4602b43ca85522029f1d335fc00b5a02db87.1606215584.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" - pass struct vidtv_psi_nit_write_args as a pointer; - avoid initializing struct fields multiple times. Signed-off-by: Mauro Carvalho Chehab --- drivers/media/test-drivers/vidtv/vidtv_mux.c | 2 +- drivers/media/test-drivers/vidtv/vidtv_psi.c | 91 ++++++++++---------- drivers/media/test-drivers/vidtv/vidtv_psi.h | 2 +- 3 files changed, 47 insertions(+), 48 deletions(-) diff --git a/drivers/media/test-drivers/vidtv/vidtv_mux.c b/drivers/media/t= est-drivers/vidtv/vidtv_mux.c index ff1c7c586838..77d691f4ff92 100644 --- a/drivers/media/test-drivers/vidtv/vidtv_mux.c +++ b/drivers/media/test-drivers/vidtv/vidtv_mux.c @@ -204,7 +204,7 @@ static u32 vidtv_mux_push_si(struct vidtv_mux *m) nit_args.offset =3D m->mux_buf_offset; nit_args.continuity_counter =3D &nit_ctx->cc; =20 - m->mux_buf_offset +=3D vidtv_psi_nit_write_into(nit_args); + m->mux_buf_offset +=3D vidtv_psi_nit_write_into(&nit_args); =20 eit_args.offset =3D m->mux_buf_offset; eit_args.continuity_counter =3D &eit_ctx->cc; diff --git a/drivers/media/test-drivers/vidtv/vidtv_psi.c b/drivers/media/t= est-drivers/vidtv/vidtv_psi.c index ffa0ff493d04..87fe3aedc8a8 100644 --- a/drivers/media/test-drivers/vidtv/vidtv_psi.c +++ b/drivers/media/test-drivers/vidtv/vidtv_psi.c @@ -1647,53 +1647,60 @@ struct vidtv_psi_table_nit return NULL; } =20 -u32 vidtv_psi_nit_write_into(struct vidtv_psi_nit_write_args args) +u32 vidtv_psi_nit_write_into(struct vidtv_psi_nit_write_args *args) { - struct vidtv_psi_desc *table_descriptor =3D args.nit->descriptor; - struct vidtv_psi_table_transport *transport =3D args.nit->transport; + struct header_write_args h_args =3D { + .dest_buf =3D args->buf, + .dest_offset =3D args->offset, + .h =3D &args->nit->header, + .pid =3D VIDTV_NIT_PID, + .dest_buf_sz =3D args->buf_sz, + }; + struct psi_write_args psi_args =3D { + .dest_buf =3D args->buf, + .from =3D &args->nit->bitfield, + .len =3D sizeof_field(struct vidtv_psi_table_nit, bitfiel= d), + .pid =3D VIDTV_NIT_PID, + .new_psi_section =3D false, + .is_crc =3D false, + .dest_buf_sz =3D args->buf_sz, + }; + struct desc_write_args d_args =3D { + .dest_buf =3D args->buf, + .pid =3D VIDTV_NIT_PID, + .dest_buf_sz =3D args->buf_sz, + }; + struct crc32_write_args c_args =3D { + .dest_buf =3D args->buf, + .pid =3D VIDTV_NIT_PID, + .dest_buf_sz =3D args->buf_sz, + }; + struct vidtv_psi_desc *table_descriptor =3D args->nit->descriptor; + struct vidtv_psi_table_transport *transport =3D args->nit->transport; struct vidtv_psi_desc *transport_descriptor; - struct header_write_args h_args =3D {}; - struct psi_write_args psi_args =3D {}; - struct desc_write_args d_args =3D {}; - struct crc32_write_args c_args =3D {}; u32 crc =3D INITIAL_CRC; u32 nbytes =3D 0; =20 - vidtv_psi_nit_table_update_sec_len(args.nit); + vidtv_psi_nit_table_update_sec_len(args->nit); =20 - h_args.dest_buf =3D args.buf; - h_args.dest_offset =3D args.offset; - h_args.h =3D &args.nit->header; - h_args.pid =3D VIDTV_NIT_PID; - h_args.continuity_counter =3D args.continuity_counter; - h_args.dest_buf_sz =3D args.buf_sz; + h_args.continuity_counter =3D args->continuity_counter; h_args.crc =3D &crc; =20 nbytes +=3D vidtv_psi_table_header_write_into(&h_args); =20 /* write the bitfield */ - psi_args.dest_buf =3D args.buf; - psi_args.from =3D &args.nit->bitfield; - psi_args.len =3D sizeof_field(struct vidtv_psi_table_nit, bitfield); =20 - psi_args.dest_offset =3D args.offset + nbytes; - psi_args.pid =3D VIDTV_NIT_PID; - psi_args.new_psi_section =3D false; - psi_args.continuity_counter =3D args.continuity_counter; - psi_args.is_crc =3D false; - psi_args.dest_buf_sz =3D args.buf_sz; + psi_args.dest_offset =3D args->offset + nbytes; + psi_args.continuity_counter =3D args->continuity_counter; psi_args.crc =3D &crc; =20 nbytes +=3D vidtv_psi_ts_psi_write_into(&psi_args); =20 while (table_descriptor) { /* write the descriptors, if any */ - d_args.dest_buf =3D args.buf; - d_args.dest_offset =3D args.offset + nbytes; + d_args.dest_offset =3D args->offset + nbytes; d_args.desc =3D table_descriptor; - d_args.pid =3D VIDTV_NIT_PID; - d_args.continuity_counter =3D args.continuity_counter; - d_args.dest_buf_sz =3D args.buf_sz; + d_args.continuity_counter =3D args->continuity_counter; d_args.crc =3D &crc; =20 nbytes +=3D vidtv_psi_desc_write_into(&d_args); @@ -1702,21 +1709,19 @@ u32 vidtv_psi_nit_write_into(struct vidtv_psi_nit_w= rite_args args) } =20 /* write the second bitfield */ - psi_args.dest_buf =3D args.buf; - psi_args.from =3D &args.nit->bitfield2; + psi_args.from =3D &args->nit->bitfield2; psi_args.len =3D sizeof_field(struct vidtv_psi_table_nit, bitfield2); - psi_args.dest_offset =3D args.offset + nbytes; - psi_args.pid =3D VIDTV_NIT_PID; + psi_args.dest_offset =3D args->offset + nbytes; =20 nbytes +=3D vidtv_psi_ts_psi_write_into(&psi_args); =20 + psi_args.len =3D sizeof_field(struct vidtv_psi_table_transport, transpor= t_id) + + sizeof_field(struct vidtv_psi_table_transport, network_id) + + sizeof_field(struct vidtv_psi_table_transport, bitfield); while (transport) { /* write the transport sections, if any */ psi_args.from =3D transport; - psi_args.len =3D sizeof_field(struct vidtv_psi_table_transport, transpo= rt_id) + - sizeof_field(struct vidtv_psi_table_transport, network_id) + - sizeof_field(struct vidtv_psi_table_transport, bitfield); - psi_args.dest_offset =3D args.offset + nbytes; + psi_args.dest_offset =3D args->offset + nbytes; =20 nbytes +=3D vidtv_psi_ts_psi_write_into(&psi_args); =20 @@ -1724,12 +1729,9 @@ u32 vidtv_psi_nit_write_into(struct vidtv_psi_nit_wr= ite_args args) =20 while (transport_descriptor) { /* write the transport descriptors, if any */ - d_args.dest_buf =3D args.buf; - d_args.dest_offset =3D args.offset + nbytes; + d_args.dest_offset =3D args->offset + nbytes; d_args.desc =3D transport_descriptor; - d_args.pid =3D VIDTV_NIT_PID; - d_args.continuity_counter =3D args.continuity_counter; - d_args.dest_buf_sz =3D args.buf_sz; + d_args.continuity_counter =3D args->continuity_counter; d_args.crc =3D &crc; =20 nbytes +=3D vidtv_psi_desc_write_into(&d_args); @@ -1740,12 +1742,9 @@ u32 vidtv_psi_nit_write_into(struct vidtv_psi_nit_wr= ite_args args) transport =3D transport->next; } =20 - c_args.dest_buf =3D args.buf; - c_args.dest_offset =3D args.offset + nbytes; + c_args.dest_offset =3D args->offset + nbytes; c_args.crc =3D cpu_to_be32(crc); - c_args.pid =3D VIDTV_NIT_PID; - c_args.continuity_counter =3D args.continuity_counter; - c_args.dest_buf_sz =3D args.buf_sz; + c_args.continuity_counter =3D args->continuity_counter; =20 /* Write the CRC32 at the end */ nbytes +=3D table_section_crc32_write_into(&c_args); diff --git a/drivers/media/test-drivers/vidtv/vidtv_psi.h b/drivers/media/t= est-drivers/vidtv/vidtv_psi.h index 5065ddb805b1..9aa43272ecfa 100644 --- a/drivers/media/test-drivers/vidtv/vidtv_psi.h +++ b/drivers/media/test-drivers/vidtv/vidtv_psi.h @@ -710,7 +710,7 @@ struct vidtv_psi_nit_write_args { * equal to the size of the NIT, since more space is needed for TS headers= during TS * encapsulation. */ -u32 vidtv_psi_nit_write_into(struct vidtv_psi_nit_write_args args); +u32 vidtv_psi_nit_write_into(struct vidtv_psi_nit_write_args *args); =20 void vidtv_psi_nit_table_destroy(struct vidtv_psi_table_nit *nit); =20 --=20 2.28.0