From nobody Sat May 10 06:12:17 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=1606216044; cv=none; d=zohomail.com; s=zohoarc; b=WqgCJ1/BawaH9W1POvi+0yo7md6HYG9zuiXQ5usj1X/myoHhJUiwkxEX2RS2u+kmsn+Azn/pJDvgfpkCkN2kwBlNFgIe7n5xNNoxb3XJq5WrFRcWRn2BrMdQXnmuIPNGcZ3Bjnd/7SpfpMOCT+EWhSRuoeN4YsJJLGH7zNQwXyQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606216044; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=XA4Jj6O/sRdRwgp4jVB1CfAn2a+Sez1OvI6zW8zpafk=; b=Y3zDmwc39eg113vh1TW0Kzuwyx3wwYS8ak+53eCHojJVwsdrItFlSNZ4Pg8k6UilBKly+79Kt4NK90cuCCFnZmdhipin/jOi/1PDgYcR6OlRS0xt+TAt19Hf1WXDhDdx+6ZWlSJFDy7muBvolKlIzBr90tiThMOjtyE0QW1/Plo= 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 160621604490036.97093472877691; Tue, 24 Nov 2020 03:07:24 -0800 (PST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732674AbgKXLHN (ORCPT ); Tue, 24 Nov 2020 06:07:13 -0500 Received: from mail.kernel.org ([198.145.29.99]:33816 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732503AbgKXLGg (ORCPT ); Tue, 24 Nov 2020 06:06:36 -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 2C92C2173E; Tue, 24 Nov 2020 11:06:31 +0000 (UTC) Received: from mchehab by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1khW9V-000FaN-77; Tue, 24 Nov 2020 12:06:29 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1606215991; bh=4YnewVN7bNoLlhyR+BQPLCFKx8h9yzavzh1UVPtHLVc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yuJB3W4RV62J0JVoiSF9DsTJXJicv46yxB3LddU9yDUC99XPj8bkBUNXFDeiARZBn ONEq251+GSOBAB+HAiOrpZ82itU3x68osh8Q8BQlCtup9zG2VRKVt0BGrhwR4lDv0Z AD+a+ezBHMrYyg4vniL2isxr6W0Nuon/mZrB+YI8= 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 23/31] media: vidtv: cleanup PSI table header function Date: Tue, 24 Nov 2020 12:06:19 +0100 Message-Id: <2169ee8f40e97b70fab8efe920db9eda16ae1b73.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 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 --- drivers/media/test-drivers/vidtv/vidtv_psi.c | 42 +++++++++----------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/drivers/media/test-drivers/vidtv/vidtv_psi.c b/drivers/media/t= est-drivers/vidtv/vidtv_psi.c index 754c32353ac2..1bc13b0d5fc6 100644 --- a/drivers/media/test-drivers/vidtv/vidtv_psi.c +++ b/drivers/media/test-drivers/vidtv/vidtv_psi.c @@ -754,26 +754,22 @@ static u32 vidtv_psi_desc_write_into(struct desc_writ= e_args *args) } =20 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 =3D {}; - /* the number of bytes written by this function */ - u32 nbytes =3D 0; + struct psi_write_args psi_args =3D { + .dest_buf =3D args->dest_buf, + .from =3D args->h, + .len =3D sizeof(struct vidtv_psi_table_header), + .dest_offset =3D args->dest_offset, + .pid =3D args->pid, + .new_psi_section =3D true, + .continuity_counter =3D args->continuity_counter, + .is_crc =3D false, + .dest_buf_sz =3D args->dest_buf_sz, + .crc =3D args->crc, + }; =20 - psi_args.dest_buf =3D args.dest_buf; - psi_args.from =3D args.h; - psi_args.len =3D sizeof(struct vidtv_psi_table_header); - psi_args.dest_offset =3D args.dest_offset; - psi_args.pid =3D args.pid; - psi_args.new_psi_section =3D true; - psi_args.continuity_counter =3D args.continuity_counter; - psi_args.is_crc =3D false; - psi_args.dest_buf_sz =3D args.dest_buf_sz; - psi_args.crc =3D args.crc; - - nbytes +=3D vidtv_psi_ts_psi_write_into(&psi_args); - - return nbytes; + return vidtv_psi_ts_psi_write_into(&psi_args); } =20 void @@ -985,7 +981,7 @@ u32 vidtv_psi_pat_write_into(struct vidtv_psi_pat_write= _args args) h_args.dest_buf_sz =3D args.buf_sz; h_args.crc =3D &crc; =20 - nbytes +=3D vidtv_psi_table_header_write_into(h_args); + nbytes +=3D vidtv_psi_table_header_write_into(&h_args); =20 /* note that the field 'u16 programs' is not really part of the PAT */ =20 @@ -1182,7 +1178,7 @@ u32 vidtv_psi_pmt_write_into(struct vidtv_psi_pmt_wri= te_args args) h_args.dest_buf_sz =3D args.buf_sz; h_args.crc =3D &crc; =20 - nbytes +=3D vidtv_psi_table_header_write_into(h_args); + nbytes +=3D vidtv_psi_table_header_write_into(&h_args); =20 /* write the two bitfields */ psi_args.dest_buf =3D args.buf; @@ -1334,7 +1330,7 @@ u32 vidtv_psi_sdt_write_into(struct vidtv_psi_sdt_wri= te_args args) h_args.dest_buf_sz =3D args.buf_sz; h_args.crc =3D &crc; =20 - nbytes +=3D vidtv_psi_table_header_write_into(h_args); + nbytes +=3D vidtv_psi_table_header_write_into(&h_args); =20 psi_args.dest_buf =3D args.buf; psi_args.from =3D &args.sdt->network_id; @@ -1670,7 +1666,7 @@ u32 vidtv_psi_nit_write_into(struct vidtv_psi_nit_wri= te_args args) h_args.dest_buf_sz =3D args.buf_sz; h_args.crc =3D &crc; =20 - nbytes +=3D vidtv_psi_table_header_write_into(h_args); + nbytes +=3D vidtv_psi_table_header_write_into(&h_args); =20 /* write the bitfield */ psi_args.dest_buf =3D args.buf; @@ -1880,7 +1876,7 @@ u32 vidtv_psi_eit_write_into(struct vidtv_psi_eit_wri= te_args args) h_args.dest_buf_sz =3D args.buf_sz; h_args.crc =3D &crc; =20 - nbytes +=3D vidtv_psi_table_header_write_into(h_args); + nbytes +=3D vidtv_psi_table_header_write_into(&h_args); =20 psi_args.dest_buf =3D args.buf; psi_args.from =3D &args.eit->transport_id; --=20 2.28.0