[12/21] media: av7110: coding style fixes: comments

Message ID 20240507002500.81867-13-herdler@nurfuerspam.de (mailing list archive)
State New
Headers
Series media: av7110: make chackpatch happier |

Commit Message

Stefan Herdler May 7, 2024, 12:24 a.m. UTC
  This patch fixes the following checkpatch warnings:

WARNING:BLOCK_COMMENT_STYLE: Block comments use a trailing */ on a separate line
WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines
WARNING:SPDX_LICENSE_TAG: Missing or malformed SPDX-License-Identifier tag in line 1
WARNING:EMBEDDED_FILENAME: It's generally not useful to have the filename in the file

Signed-off-by: Stefan Herdler <herdler@nurfuerspam.de>
---
 drivers/staging/media/av7110/av7110.c     | 14 ++++++++------
 drivers/staging/media/av7110/av7110_av.c  |  6 ++++--
 drivers/staging/media/av7110/av7110_ca.c  |  3 ++-
 drivers/staging/media/av7110/av7110_hw.c  |  9 ++++++---
 drivers/staging/media/av7110/av7110_hw.h  |  6 ++++--
 drivers/staging/media/av7110/av7110_v4l.c | 14 +++++++++-----
 drivers/staging/media/av7110/dvb_filter.h | 12 ++++++------
 7 files changed, 39 insertions(+), 25 deletions(-)

--
2.34.0
  

Patch

diff --git a/drivers/staging/media/av7110/av7110.c b/drivers/staging/media/av7110/av7110.c
index 27019e3f3..49735cbb2 100644
--- a/drivers/staging/media/av7110/av7110.c
+++ b/drivers/staging/media/av7110/av7110.c
@@ -1,7 +1,7 @@ 
 // SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * driver for the SAA7146 based AV110 cards (like the Fujitsu-Siemens DVB)
- * av7110.c: initialization and demux stuff
+ * - initialization and demux stuff
  *
  * Copyright (C) 1999-2002 Ralph  Metzler
  *                       & Marcus Metzler for convergence integrated media GmbH
@@ -2444,7 +2444,8 @@  static int av7110_attach(struct saa7146_dev *dev,
 		goto err_put_firmware_1;

 	/* the Siemens DVB needs this if you want to have the i2c chips
-	   get recognized before the main driver is fully loaded */
+	 * get recognized before the main driver is fully loaded
+	 */
 	saa7146_write(dev, GPIO_CTRL, 0x500000);

 	strscpy(av7110->i2c_adap.name, pci_ext->ext_priv,
@@ -2671,8 +2672,9 @@  static int av7110_attach(struct saa7146_dev *dev,
 	init_av7110_av(av7110);

 	/* special case DVB-C: these cards have an analog tuner
-	   plus need some special handling, so we have separate
-	   saa7146_ext_vv data for these... */
+	 * plus need some special handling, so we have separate
+	 * saa7146_ext_vv data for these...
+	 */
 	ret = av7110_init_v4l(av7110);
 	if (ret < 0)
 		goto err_av7110_unregister_11;
@@ -2853,8 +2855,8 @@  static const struct pci_device_id pci_tbl[] = {
 	MAKE_EXTENSION_PCI(tts_2_3,     0x13c2, 0x000e),
 	MAKE_EXTENSION_PCI(tts_1_3se,   0x13c2, 0x1002),

-/*	MAKE_EXTENSION_PCI(???, 0x13c2, 0x0005), UNDEFINED CARD */ // Technisat SkyStar1
-/*	MAKE_EXTENSION_PCI(???, 0x13c2, 0x0009), UNDEFINED CARD */ // TT/Hauppauge WinTV Nexus-CA v????
+//	MAKE_EXTENSION_PCI(???, 0x13c2, 0x0005), UNDEFINED CARD  // Technisat SkyStar1
+//	MAKE_EXTENSION_PCI(???, 0x13c2, 0x0009), UNDEFINED CARD  // TT/Hauppauge WinTV Nexus-CA v???

 	{
 		.vendor    = 0,
diff --git a/drivers/staging/media/av7110/av7110_av.c b/drivers/staging/media/av7110/av7110_av.c
index e031d6028..f5200aa3d 100644
--- a/drivers/staging/media/av7110/av7110_av.c
+++ b/drivers/staging/media/av7110/av7110_av.c
@@ -1,6 +1,7 @@ 
 // SPDX-License-Identifier: GPL-2.0-or-later
 /*
- * av7110_av.c: audio and video MPEG decoder stuff
+ * driver for the SAA7146 based AV110 cards
+ * - audio and video MPEG decoder stuff
  *
  * Copyright (C) 1999-2002 Ralph  Metzler
  *                       & Marcus Metzler for convergence integrated media GmbH
@@ -1060,7 +1061,8 @@  static int play_iframe(struct av7110 *av7110, char __user *buf, unsigned int len
 	}

 	/* setting n always > 1, fixes problems when playing stillframes
-	   consisting of I- and P-Frames */
+	 * consisting of I- and P-Frames
+	 */
 	n = MIN_IFRAME / len + 1;

 	/* FIXME: nonblock? */
diff --git a/drivers/staging/media/av7110/av7110_ca.c b/drivers/staging/media/av7110/av7110_ca.c
index 682204a6f..c28e41d42 100644
--- a/drivers/staging/media/av7110/av7110_ca.c
+++ b/drivers/staging/media/av7110/av7110_ca.c
@@ -1,6 +1,7 @@ 
 // SPDX-License-Identifier: GPL-2.0-or-later
 /*
- * av7110_ca.c: CA and CI stuff
+ * driver for the SAA7146 based AV110 cards
+ * - CA and CI stuff
  *
  * Copyright (C) 1999-2002 Ralph  Metzler
  *                       & Marcus Metzler for convergence integrated media GmbH
diff --git a/drivers/staging/media/av7110/av7110_hw.c b/drivers/staging/media/av7110/av7110_hw.c
index ef4090fb1..c7ea72128 100644
--- a/drivers/staging/media/av7110/av7110_hw.c
+++ b/drivers/staging/media/av7110/av7110_hw.c
@@ -1,6 +1,7 @@ 
 // SPDX-License-Identifier: GPL-2.0-or-later
 /*
- * av7110_hw.c: av7110 low level hardware access and firmware interface
+ * driver for the SAA7146 based AV110 cards
+ * - av7110 low level hardware access and firmware interface
  *
  * Copyright (C) 1999-2002 Ralph  Metzler
  *                       & Marcus Metzler for convergence integrated media GmbH
@@ -38,7 +39,8 @@ 
  ****************************************************************************/

 /* This DEBI code is based on the Stradis driver
-   by Nathan Laredo <laredo@gnu.org> */
+ * by Nathan Laredo <laredo@gnu.org>
+ */

 int av7110_debiwrite(struct av7110 *av7110, u32 config,
 		     int addr, u32 val, unsigned int count)
@@ -187,7 +189,8 @@  static int load_dram(struct av7110 *av7110, u32 *data, int len)
 }

 /* we cannot write av7110 DRAM directly, so load a bootloader into
- * the DPRAM which implements a simple boot protocol */
+ * the DPRAM which implements a simple boot protocol
+ */
 int av7110_bootarm(struct av7110 *av7110)
 {
 	const struct firmware *fw;
diff --git a/drivers/staging/media/av7110/av7110_hw.h b/drivers/staging/media/av7110/av7110_hw.h
index 3d0afae7f..c13b8c479 100644
--- a/drivers/staging/media/av7110/av7110_hw.h
+++ b/drivers/staging/media/av7110/av7110_hw.h
@@ -250,7 +250,8 @@  enum av7110_command_type {
 #define DATA_TS_PLAY		 0x13

 /* ancient CI command codes, only two are actually still used
- * by the link level CI firmware */
+ * by the link level CI firmware
+ */
 #define CI_CMD_ERROR		 0x00
 #define CI_CMD_ACK		 0x01
 #define CI_CMD_SYSTEM_READY	 0x02
@@ -286,7 +287,8 @@  enum av7110_command_type {

 /* base address of the dual ported RAM which serves as communication
  * area between PCI bus and av7110,
- * as seen by the DEBI bus of the saa7146 */
+ * as seen by the DEBI bus of the saa7146
+ */
 #define	DPRAM_BASE 0x4000

 /* boot protocol area */
diff --git a/drivers/staging/media/av7110/av7110_v4l.c b/drivers/staging/media/av7110/av7110_v4l.c
index 3090efb00..633dbb697 100644
--- a/drivers/staging/media/av7110/av7110_v4l.c
+++ b/drivers/staging/media/av7110/av7110_v4l.c
@@ -1,6 +1,7 @@ 
 // SPDX-License-Identifier: GPL-2.0-or-later
 /*
- * av7110_v4l.c: av7110 video4linux interface for DVB and Siemens DVB-C analog module
+ * driver for the SAA7146 based AV110 cards
+ * - video4linux interface for DVB and Siemens DVB-C analog module
  *
  * Copyright (C) 1999-2002 Ralph  Metzler
  *                       & Marcus Metzler for convergence integrated media GmbH
@@ -153,7 +154,8 @@  static int ves1820_set_tv_freq(struct saa7146_dev *dev, u32 freq)
 	dprintk(4, "freq: 0x%08x\n", freq);

 	/* magic number: 614. tuning with the frequency given by v4l2
-	   is always off by 614*62.5 = 38375 kHz...*/
+	 * is always off by 614*62.5 = 38375 kHz...
+	 */
 	div = freq + 614;

 	buf[0] = (div >> 8) & 0x7f;
@@ -801,8 +803,9 @@  int av7110_init_v4l(struct av7110 *av7110)
 	int ret;

 	/* special case DVB-C: these cards have an analog tuner
-	   plus need some special handling, so we have separate
-	   saa7146_ext_vv data for these... */
+	 * plus need some special handling, so we have separate
+	 * saa7146_ext_vv data for these...
+	 */
 	if (av7110->analog_tuner_flags)
 		vv_data = &av7110_vv_data_c;
 	else
@@ -865,7 +868,8 @@  int av7110_exit_v4l(struct av7110 *av7110)
 }

 /* FIXME: these values are experimental values that look better than the
-   values from the latest "official" driver -- at least for me... (MiHu) */
+ * values from the latest "official" driver -- at least for me... (MiHu)
+ */
 static struct saa7146_standard standard[] = {
 	{
 		.name	= "PAL",	.id		= V4L2_STD_PAL_BG,
diff --git a/drivers/staging/media/av7110/dvb_filter.h b/drivers/staging/media/av7110/dvb_filter.h
index 471b53058..38b483508 100644
--- a/drivers/staging/media/av7110/dvb_filter.h
+++ b/drivers/staging/media/av7110/dvb_filter.h
@@ -1,6 +1,5 @@ 
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
- * dvb_filter.h
- *
  * Copyright (C) 2003 Convergence GmbH
  *
  * This program is free software; you can redistribute it and/or
@@ -184,10 +183,11 @@  struct mpg_picture {
 	s8        matrix_change_flag;

 	u8        picture_header_parameter;
-  /* bit 0 - 2: bwd f code
-     bit 3    : fpb vector
-     bit 4 - 6: fwd f code
-     bit 7    : fpf vector */
+	/* bit 0 - 2: bwd f code
+	 * bit 3    : fpb vector
+	 * bit 4 - 6: fwd f code
+	 * bit 7    : fpf vector
+	 */

 	int       mpeg1_flag;
 	int       progressive_sequence;