From nobody Sat May 10 05:35:14 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=1606216045; cv=none; d=zohomail.com; s=zohoarc; b=FfjWHgDqgkoxRby6GWZ98JJi5GBd/6cSo1DiAapeAbT9g7KDGmOq0aO+f9vbWJ0pI8A/3QC4TwVmytdEJxAGPW5VOAEs3vAi36rz4rcjZcdc6JqoYASxS0BTfvmdCX+2yZHIc1+oWVUmS/6OlLtQwhWOQN6erwVlZ7itJJYA+hI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606216045; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Pj8mlGrYc4rDBOUtvd6YOFm52DElG6YCUCaA14Y/nek=; b=e691WRVKGZIz6k0fmmfgFCj4Hd9z6Zsl1Kuuq5cMcLpICYO5Jiz31HAn1IzL74+KP9vlz4rYyXuRbbHkAI2ESph+ASKOLW4xLx2+kpg8W4T+4kpf6WxHO6CewLjw3hzuVZe701eDHf/2JWayRmzNk5eprQ9njYTQcg2hLdOm8tA= 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 1606216045204243.29954141211272; Tue, 24 Nov 2020 03:07:25 -0800 (PST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732688AbgKXLHR (ORCPT ); Tue, 24 Nov 2020 06:07:17 -0500 Received: from mail.kernel.org ([198.145.29.99]:33790 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731805AbgKXLGf (ORCPT ); Tue, 24 Nov 2020 06:06:35 -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 27F4D2168B; 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-000FaJ-67; 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=R7psA8I1w0DRaZ6AZosSdABuf7nVS5xifafO8eF4Gxk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WWgiR4pUDpYjKrwMCiLmVxxbzW+LD/D7GVXl/z14PLYgHBSJnWO9CknFhmRcCGf4G ejipTkIvJbjDy5stZSI7+/qdNpK5rOw5YgcYhem1o9qvCeIIigpWdkHI+Rj5OENJ26 rrUG/tqBxp5GYyvs2ZBKz0lAL3wMPyfKExZIec74= 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 22/31] media: vidtv: cleanup PSI descriptor write function Date: Tue, 24 Nov 2020 12:06:18 +0100 Message-Id: <9e0d29e2b7dbc232ae5176a43dae9ef40932b994.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" This function initializes the psi_args twice, and receives a struct, instead of a pointer to a struct. Clean it up. Signed-off-by: Mauro Carvalho Chehab --- drivers/media/test-drivers/vidtv/vidtv_psi.c | 104 +++++++++---------- 1 file changed, 51 insertions(+), 53 deletions(-) diff --git a/drivers/media/test-drivers/vidtv/vidtv_psi.c b/drivers/media/t= est-drivers/vidtv/vidtv_psi.c index 423b4fa2e473..754c32353ac2 100644 --- a/drivers/media/test-drivers/vidtv/vidtv_psi.c +++ b/drivers/media/test-drivers/vidtv/vidtv_psi.c @@ -634,69 +634,67 @@ void vidtv_sdt_desc_assign(struct vidtv_psi_table_sdt= *sdt, vidtv_psi_update_version_num(&sdt->header); } =20 -static u32 vidtv_psi_desc_write_into(struct desc_write_args args) +static u32 vidtv_psi_desc_write_into(struct desc_write_args *args) { + struct psi_write_args psi_args =3D { + .dest_buf =3D args->dest_buf, + .from =3D &args->desc->type, + .pid =3D args->pid, + .new_psi_section =3D false, + .continuity_counter =3D args->continuity_counter, + .is_crc =3D false, + .dest_buf_sz =3D args->dest_buf_sz, + .crc =3D args->crc, + .len =3D sizeof_field(struct vidtv_psi_desc, type) + + sizeof_field(struct vidtv_psi_desc, length), + }; struct vidtv_psi_desc_service_list_entry *serv_list_entry =3D NULL; - struct psi_write_args psi_args =3D {}; - /* the number of bytes written by this function */ u32 nbytes =3D 0; =20 - psi_args.dest_buf =3D args.dest_buf; - psi_args.from =3D &args.desc->type; - - psi_args.len =3D sizeof_field(struct vidtv_psi_desc, type) + - sizeof_field(struct vidtv_psi_desc, length); - - psi_args.dest_offset =3D args.dest_offset + nbytes; - psi_args.pid =3D args.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.dest_buf_sz; - psi_args.crc =3D args.crc; + psi_args.dest_offset =3D args->dest_offset + nbytes; =20 nbytes +=3D vidtv_psi_ts_psi_write_into(&psi_args); =20 - switch (args.desc->type) { + switch (args->desc->type) { case SERVICE_DESCRIPTOR: - psi_args.dest_offset =3D args.dest_offset + nbytes; + psi_args.dest_offset =3D args->dest_offset + nbytes; psi_args.len =3D sizeof_field(struct vidtv_psi_desc_service, service_typ= e) + sizeof_field(struct vidtv_psi_desc_service, provider_name_len); - psi_args.from =3D &((struct vidtv_psi_desc_service *)args.desc)->service= _type; + psi_args.from =3D &((struct vidtv_psi_desc_service *)args->desc)->servic= e_type; =20 nbytes +=3D vidtv_psi_ts_psi_write_into(&psi_args); =20 - psi_args.dest_offset =3D args.dest_offset + nbytes; - psi_args.len =3D ((struct vidtv_psi_desc_service *)args.desc)->provider_= name_len; - psi_args.from =3D ((struct vidtv_psi_desc_service *)args.desc)->provider= _name; + psi_args.dest_offset =3D args->dest_offset + nbytes; + psi_args.len =3D ((struct vidtv_psi_desc_service *)args->desc)->provider= _name_len; + psi_args.from =3D ((struct vidtv_psi_desc_service *)args->desc)->provide= r_name; =20 nbytes +=3D vidtv_psi_ts_psi_write_into(&psi_args); =20 - psi_args.dest_offset =3D args.dest_offset + nbytes; + psi_args.dest_offset =3D args->dest_offset + nbytes; psi_args.len =3D sizeof_field(struct vidtv_psi_desc_service, service_nam= e_len); - psi_args.from =3D &((struct vidtv_psi_desc_service *)args.desc)->service= _name_len; + psi_args.from =3D &((struct vidtv_psi_desc_service *)args->desc)->servic= e_name_len; =20 nbytes +=3D vidtv_psi_ts_psi_write_into(&psi_args); =20 - psi_args.dest_offset =3D args.dest_offset + nbytes; - psi_args.len =3D ((struct vidtv_psi_desc_service *)args.desc)->service_n= ame_len; - psi_args.from =3D ((struct vidtv_psi_desc_service *)args.desc)->service_= name; + psi_args.dest_offset =3D args->dest_offset + nbytes; + psi_args.len =3D ((struct vidtv_psi_desc_service *)args->desc)->service_= name_len; + psi_args.from =3D ((struct vidtv_psi_desc_service *)args->desc)->service= _name; =20 nbytes +=3D vidtv_psi_ts_psi_write_into(&psi_args); break; =20 case NETWORK_NAME_DESCRIPTOR: - psi_args.dest_offset =3D args.dest_offset + nbytes; - psi_args.len =3D args.desc->length; - psi_args.from =3D ((struct vidtv_psi_desc_network_name *)args.desc)->net= work_name; + psi_args.dest_offset =3D args->dest_offset + nbytes; + psi_args.len =3D args->desc->length; + psi_args.from =3D ((struct vidtv_psi_desc_network_name *)args->desc)->ne= twork_name; =20 nbytes +=3D vidtv_psi_ts_psi_write_into(&psi_args); break; =20 case SERVICE_LIST_DESCRIPTOR: - serv_list_entry =3D ((struct vidtv_psi_desc_service_list *)args.desc)->s= ervice_list; + serv_list_entry =3D ((struct vidtv_psi_desc_service_list *)args->desc)->= service_list; while (serv_list_entry) { - psi_args.dest_offset =3D args.dest_offset + nbytes; + psi_args.dest_offset =3D args->dest_offset + nbytes; psi_args.len =3D sizeof(struct vidtv_psi_desc_service_list_entry) - sizeof(struct vidtv_psi_desc_service_list_entry *); psi_args.from =3D serv_list_entry; @@ -708,35 +706,35 @@ static u32 vidtv_psi_desc_write_into(struct desc_writ= e_args args) break; =20 case SHORT_EVENT_DESCRIPTOR: - psi_args.dest_offset =3D args.dest_offset + nbytes; + psi_args.dest_offset =3D args->dest_offset + nbytes; psi_args.len =3D ISO_LANGUAGE_CODE_LEN; psi_args.from =3D ((struct vidtv_psi_desc_short_event *) - args.desc)->iso_language_code; + args->desc)->iso_language_code; =20 nbytes +=3D vidtv_psi_ts_psi_write_into(&psi_args); =20 - psi_args.dest_offset =3D args.dest_offset + nbytes; + psi_args.dest_offset =3D args->dest_offset + nbytes; psi_args.len =3D sizeof_field(struct vidtv_psi_desc_short_event, event_n= ame_len); psi_args.from =3D &((struct vidtv_psi_desc_short_event *) - args.desc)->event_name_len; + args->desc)->event_name_len; =20 nbytes +=3D vidtv_psi_ts_psi_write_into(&psi_args); =20 - psi_args.dest_offset =3D args.dest_offset + nbytes; - psi_args.len =3D ((struct vidtv_psi_desc_short_event *)args.desc)->event= _name_len; - psi_args.from =3D ((struct vidtv_psi_desc_short_event *)args.desc)->even= t_name; + psi_args.dest_offset =3D args->dest_offset + nbytes; + psi_args.len =3D ((struct vidtv_psi_desc_short_event *)args->desc)->even= t_name_len; + psi_args.from =3D ((struct vidtv_psi_desc_short_event *)args->desc)->eve= nt_name; =20 nbytes +=3D vidtv_psi_ts_psi_write_into(&psi_args); =20 - psi_args.dest_offset =3D args.dest_offset + nbytes; + psi_args.dest_offset =3D args->dest_offset + nbytes; psi_args.len =3D sizeof_field(struct vidtv_psi_desc_short_event, text_le= n); - psi_args.from =3D &((struct vidtv_psi_desc_short_event *)args.desc)->tex= t_len; + psi_args.from =3D &((struct vidtv_psi_desc_short_event *)args->desc)->te= xt_len; =20 nbytes +=3D vidtv_psi_ts_psi_write_into(&psi_args); =20 - psi_args.dest_offset =3D args.dest_offset + nbytes; - psi_args.len =3D ((struct vidtv_psi_desc_short_event *)args.desc)->text_= len; - psi_args.from =3D ((struct vidtv_psi_desc_short_event *)args.desc)->text; + psi_args.dest_offset =3D args->dest_offset + nbytes; + psi_args.len =3D ((struct vidtv_psi_desc_short_event *)args->desc)->text= _len; + psi_args.from =3D ((struct vidtv_psi_desc_short_event *)args->desc)->tex= t; =20 nbytes +=3D vidtv_psi_ts_psi_write_into(&psi_args); =20 @@ -744,9 +742,9 @@ static u32 vidtv_psi_desc_write_into(struct desc_write_= args args) =20 case REGISTRATION_DESCRIPTOR: default: - psi_args.dest_offset =3D args.dest_offset + nbytes; - psi_args.len =3D args.desc->length; - psi_args.from =3D &args.desc->data; + psi_args.dest_offset =3D args->dest_offset + nbytes; + psi_args.len =3D args->desc->length; + psi_args.from =3D &args->desc->data; =20 nbytes +=3D vidtv_psi_ts_psi_write_into(&psi_args); break; @@ -1212,7 +1210,7 @@ u32 vidtv_psi_pmt_write_into(struct vidtv_psi_pmt_wri= te_args args) d_args.dest_buf_sz =3D args.buf_sz; d_args.crc =3D &crc; =20 - nbytes +=3D vidtv_psi_desc_write_into(d_args); + nbytes +=3D vidtv_psi_desc_write_into(&d_args); =20 table_descriptor =3D table_descriptor->next; } @@ -1239,7 +1237,7 @@ u32 vidtv_psi_pmt_write_into(struct vidtv_psi_pmt_wri= te_args args) d_args.dest_buf_sz =3D args.buf_sz; d_args.crc =3D &crc; =20 - nbytes +=3D vidtv_psi_desc_write_into(d_args); + nbytes +=3D vidtv_psi_desc_write_into(&d_args); =20 stream_descriptor =3D stream_descriptor->next; } @@ -1378,7 +1376,7 @@ u32 vidtv_psi_sdt_write_into(struct vidtv_psi_sdt_wri= te_args args) d_args.dest_buf_sz =3D args.buf_sz; d_args.crc =3D &crc; =20 - nbytes +=3D vidtv_psi_desc_write_into(d_args); + nbytes +=3D vidtv_psi_desc_write_into(&d_args); =20 service_desc =3D service_desc->next; } @@ -1699,7 +1697,7 @@ u32 vidtv_psi_nit_write_into(struct vidtv_psi_nit_wri= te_args args) d_args.dest_buf_sz =3D args.buf_sz; d_args.crc =3D &crc; =20 - nbytes +=3D vidtv_psi_desc_write_into(d_args); + nbytes +=3D vidtv_psi_desc_write_into(&d_args); =20 table_descriptor =3D table_descriptor->next; } @@ -1735,7 +1733,7 @@ u32 vidtv_psi_nit_write_into(struct vidtv_psi_nit_wri= te_args args) d_args.dest_buf_sz =3D args.buf_sz; d_args.crc =3D &crc; =20 - nbytes +=3D vidtv_psi_desc_write_into(d_args); + nbytes +=3D vidtv_psi_desc_write_into(&d_args); =20 transport_descriptor =3D transport_descriptor->next; } @@ -1925,7 +1923,7 @@ u32 vidtv_psi_eit_write_into(struct vidtv_psi_eit_wri= te_args args) d_args.dest_buf_sz =3D args.buf_sz; d_args.crc =3D &crc; =20 - nbytes +=3D vidtv_psi_desc_write_into(d_args); + nbytes +=3D vidtv_psi_desc_write_into(&d_args); =20 event_descriptor =3D event_descriptor->next; } --=20 2.28.0