Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <511162f4-aa03-8526-3ea6-0f9d2edeae10@stuerz.xyz>
Date:   Sun, 27 Mar 2022 15:33:04 +0200
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.7.0
Subject: [PATCH 16/22 v2] dvb-usb: Replace comments with C99 initializers
Content-Language: en-US
To:     =?UTF-8?Q?Benjamin_St=c3=bcrz?= <benni@stuerz.xyz>
References: <20220326165909.506926-1-benni@stuerz.xyz>
 <20220326165909.506926-16-benni@stuerz.xyz>
Cc:     "linux-kernel@vger.kernel.org linux-media@vger.kernel.org mchehab"@kernel.org
From:   =?UTF-8?Q?Benjamin_St=c3=bcrz?= <benni@stuerz.xyz>
In-Reply-To: <20220326165909.506926-16-benni@stuerz.xyz>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: bulk

Changes since v1:
 * Reformatted both tables
 * Respecting 80-column line limit

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/media/usb/dvb-usb/dibusb-mb.c | 148 ++++++++++++++++++--------
 drivers/media/usb/dvb-usb/dibusb-mc.c |  67 +++++++++---
 2 files changed, 154 insertions(+), 61 deletions(-)

diff --git a/drivers/media/usb/dvb-usb/dibusb-mb.c
b/drivers/media/usb/dvb-usb/dibusb-mb.c
index e9dc27f73970..ffc27318f823 100644
--- a/drivers/media/usb/dvb-usb/dibusb-mb.c
+++ b/drivers/media/usb/dvb-usb/dibusb-mb.c
@@ -122,54 +122,114 @@ static int dibusb_probe(struct usb_interface *intf,

 /* do not change the order of the ID table */
 static struct usb_device_id dibusb_dib3000mb_table [] = {
-/* 00 */	{ USB_DEVICE(USB_VID_WIDEVIEW,	
USB_PID_AVERMEDIA_DVBT_USB_COLD) },
-/* 01 */	{ USB_DEVICE(USB_VID_WIDEVIEW,	
USB_PID_AVERMEDIA_DVBT_USB_WARM) },
-/* 02 */	{ USB_DEVICE(USB_VID_COMPRO,		USB_PID_COMPRO_DVBU2000_COLD) },
-/* 03 */	{ USB_DEVICE(USB_VID_COMPRO,		USB_PID_COMPRO_DVBU2000_WARM) },
-/* 04 */	{ USB_DEVICE(USB_VID_COMPRO_UNK,
USB_PID_COMPRO_DVBU2000_UNK_COLD) },
-/* 05 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3000_COLD) },
-/* 06 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3000_WARM) },
-/* 07 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_KWORLD_VSTREAM_COLD) },
-/* 08 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_KWORLD_VSTREAM_WARM) },
-/* 09 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_GRANDTEC_DVBT_USB_COLD) },
-/* 10 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_GRANDTEC_DVBT_USB_WARM) },
-/* 11 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_DIBCOM_MOD3000_COLD) },
-/* 12 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_DIBCOM_MOD3000_WARM) },
-/* 13 */	{ USB_DEVICE(USB_VID_HYPER_PALTEK,
USB_PID_UNK_HYPER_PALTEK_COLD) },
-/* 14 */	{ USB_DEVICE(USB_VID_HYPER_PALTEK,
USB_PID_UNK_HYPER_PALTEK_WARM) },
-/* 15 */	{ USB_DEVICE(USB_VID_VISIONPLUS,	USB_PID_TWINHAN_VP7041_COLD) },
-/* 16 */	{ USB_DEVICE(USB_VID_VISIONPLUS,	USB_PID_TWINHAN_VP7041_WARM) },
-/* 17 */	{ USB_DEVICE(USB_VID_TWINHAN,		USB_PID_TWINHAN_VP7041_COLD) },
-/* 18 */	{ USB_DEVICE(USB_VID_TWINHAN,		USB_PID_TWINHAN_VP7041_WARM) },
-/* 19 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,
USB_PID_ULTIMA_TVBOX_COLD) },
-/* 20 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,
USB_PID_ULTIMA_TVBOX_WARM) },
-/* 21 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,
USB_PID_ULTIMA_TVBOX_AN2235_COLD) },
-/* 22 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,
USB_PID_ULTIMA_TVBOX_AN2235_WARM) },
-/* 23 */	{ USB_DEVICE(USB_VID_ADSTECH,		USB_PID_ADSTECH_USB2_COLD) },
-
-/* device ID with default DIBUSB2_0-firmware and with the hacked
firmware */
-/* 24 */	{ USB_DEVICE(USB_VID_ADSTECH,		USB_PID_ADSTECH_USB2_WARM) },
-/* 25 */	{ USB_DEVICE(USB_VID_KYE,		USB_PID_KYE_DVB_T_COLD) },
-/* 26 */	{ USB_DEVICE(USB_VID_KYE,		USB_PID_KYE_DVB_T_WARM) },
-
-/* 27 */	{ USB_DEVICE(USB_VID_KWORLD,		USB_PID_KWORLD_VSTREAM_COLD) },
-
-/* 28 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,
USB_PID_ULTIMA_TVBOX_USB2_COLD) },
-/* 29 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,
USB_PID_ULTIMA_TVBOX_USB2_WARM) },
-
-/*
- * XXX: As Artec just 'forgot' to program the EEPROM on some Artec T1
devices
- *      we don't catch these faulty IDs (namely 'Cypress FX1 USB
controller') that
- *      have been left on the device. If you don't have such a device
but an Artec
- *      device that's supposed to work with this driver but is not
detected by it,
- *      free to enable CONFIG_DVB_USB_DIBUSB_MB_FAULTY via your kernel
config.
- */
+	[0]  = { USB_DEVICE(USB_VID_WIDEVIEW,
+			    USB_PID_AVERMEDIA_DVBT_USB_COLD)
+	},
+	[1]  = { USB_DEVICE(USB_VID_WIDEVIEW,
+			    USB_PID_AVERMEDIA_DVBT_USB_WARM)
+	},
+	[2]  = { USB_DEVICE(USB_VID_COMPRO,
+			    USB_PID_COMPRO_DVBU2000_COLD)
+	},
+	[3]  = { USB_DEVICE(USB_VID_COMPRO,
+			    USB_PID_COMPRO_DVBU2000_WARM)
+	},
+	[4]  = { USB_DEVICE(USB_VID_COMPRO_UNK,
+			    USB_PID_COMPRO_DVBU2000_UNK_COLD)
+	},
+	[5]  = { USB_DEVICE(USB_VID_DIBCOM,
+			    USB_PID_DIBCOM_MOD3000_COLD)
+	},
+	[6]  = { USB_DEVICE(USB_VID_DIBCOM,
+			    USB_PID_DIBCOM_MOD3000_WARM)
+	},
+	[7]  = { USB_DEVICE(USB_VID_EMPIA,
+			    USB_PID_KWORLD_VSTREAM_COLD)
+	},
+	[8]  = { USB_DEVICE(USB_VID_EMPIA,
+			    USB_PID_KWORLD_VSTREAM_WARM)
+	},
+	[9]  = { USB_DEVICE(USB_VID_GRANDTEC,
+			    USB_PID_GRANDTEC_DVBT_USB_COLD)
+	},
+	[10] = { USB_DEVICE(USB_VID_GRANDTEC,
+			    USB_PID_GRANDTEC_DVBT_USB_WARM)
+	},
+	[11] = { USB_DEVICE(USB_VID_GRANDTEC,
+			    USB_PID_DIBCOM_MOD3000_COLD)
+	},
+	[12] = { USB_DEVICE(USB_VID_GRANDTEC,
+			    USB_PID_DIBCOM_MOD3000_WARM)
+	},
+	[13] = { USB_DEVICE(USB_VID_HYPER_PALTEK,
+			    USB_PID_UNK_HYPER_PALTEK_COLD)
+	},
+	[14] = { USB_DEVICE(USB_VID_HYPER_PALTEK,
+			    USB_PID_UNK_HYPER_PALTEK_WARM)
+	},
+	[15] = { USB_DEVICE(USB_VID_VISIONPLUS,
+			    USB_PID_TWINHAN_VP7041_COLD)
+	},
+	[16] = { USB_DEVICE(USB_VID_VISIONPLUS,
+			    USB_PID_TWINHAN_VP7041_WARM)
+	},
+	[17] = { USB_DEVICE(USB_VID_TWINHAN,
+			    USB_PID_TWINHAN_VP7041_COLD)
+	},
+	[18] = { USB_DEVICE(USB_VID_TWINHAN,
+			    USB_PID_TWINHAN_VP7041_WARM)
+	},
+	[19] = { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,
+			    USB_PID_ULTIMA_TVBOX_COLD)
+	},
+	[20] = { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,
+			    USB_PID_ULTIMA_TVBOX_WARM)
+	},
+	[21] = { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,
+			    USB_PID_ULTIMA_TVBOX_AN2235_COLD)
+	},
+	[22] = { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,
+			    USB_PID_ULTIMA_TVBOX_AN2235_WARM)
+	},
+	[23] = { USB_DEVICE(USB_VID_ADSTECH,
+			    USB_PID_ADSTECH_USB2_COLD)
+	},
+
+	/* device ID with default DIBUSB2_0-firmware and with the hacked
firmware */
+	[24] = { USB_DEVICE(USB_VID_ADSTECH,
+			    USB_PID_ADSTECH_USB2_WARM)
+	},
+	[25] = { USB_DEVICE(USB_VID_KYE,
+			    USB_PID_KYE_DVB_T_COLD)
+	},
+	[26] = { USB_DEVICE(USB_VID_KYE,
+			    USB_PID_KYE_DVB_T_WARM)
+	},
+	[27] = { USB_DEVICE(USB_VID_KWORLD,
+			    USB_PID_KWORLD_VSTREAM_COLD)
+	},
+	[28] = { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,
+			    USB_PID_ULTIMA_TVBOX_USB2_COLD)
+	},
+	[29] = { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,
+			    USB_PID_ULTIMA_TVBOX_USB2_WARM)
+	},
+
+	/*
+	 * XXX: As Artec just 'forgot' to program the EEPROM on some Artec T1
devices
+	 *      we don't catch these faulty IDs (namely 'Cypress FX1 USB
controller') that
+	 *      have been left on the device. If you don't have such a device
but an Artec
+	 *      device that's supposed to work with this driver but is not
detected by it,
+	 *      free to enable CONFIG_DVB_USB_DIBUSB_MB_FAULTY via your kernel
config.
+	 */

 #ifdef CONFIG_DVB_USB_DIBUSB_MB_FAULTY
-/* 30 */	{ USB_DEVICE(USB_VID_ANCHOR,		USB_PID_ULTIMA_TVBOX_ANCHOR_COLD) },
+	[30] = { USB_DEVICE(USB_VID_ANCHOR,
+			    USB_PID_ULTIMA_TVBOX_ANCHOR_COLD)
+	},
 #endif

-			{ }		/* Terminating entry */
+	{ }		/* Terminating entry */
 };
 MODULE_DEVICE_TABLE (usb, dibusb_dib3000mb_table);

diff --git a/drivers/media/usb/dvb-usb/dibusb-mc.c
b/drivers/media/usb/dvb-usb/dibusb-mc.c
index e2689977c8c8..57805013f3ac 100644
--- a/drivers/media/usb/dvb-usb/dibusb-mc.c
+++ b/drivers/media/usb/dvb-usb/dibusb-mc.c
@@ -25,23 +25,56 @@ static int dibusb_mc_probe(struct usb_interface *intf,

 /* do not change the order of the ID table */
 static struct usb_device_id dibusb_dib3000mc_table [] = {
-/* 00 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3001_COLD) },
-/* 01 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3001_WARM) },
-/* 02 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,
USB_PID_ULTIMA_TVBOX_USB2_COLD) },
-/* 03 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,
USB_PID_ULTIMA_TVBOX_USB2_WARM) }, // ( ? )
-/* 04 */	{ USB_DEVICE(USB_VID_LITEON,		USB_PID_LITEON_DVB_T_COLD) },
-/* 05 */	{ USB_DEVICE(USB_VID_LITEON,		USB_PID_LITEON_DVB_T_WARM) },
-/* 06 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_DIGIVOX_MINI_SL_COLD) },
-/* 07 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_DIGIVOX_MINI_SL_WARM) },
-/* 08 */	{ USB_DEVICE(USB_VID_GRANDTEC,
USB_PID_GRANDTEC_DVBT_USB2_COLD) },
-/* 09 */	{ USB_DEVICE(USB_VID_GRANDTEC,
USB_PID_GRANDTEC_DVBT_USB2_WARM) },
-/* 10 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ARTEC_T14_COLD) },
-/* 11 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ARTEC_T14_WARM) },
-/* 12 */	{ USB_DEVICE(USB_VID_LEADTEK,		USB_PID_WINFAST_DTV_DONGLE_COLD) },
-/* 13 */	{ USB_DEVICE(USB_VID_LEADTEK,		USB_PID_WINFAST_DTV_DONGLE_WARM) },
-/* 14 */	{ USB_DEVICE(USB_VID_HUMAX_COEX,
USB_PID_DVB_T_USB_STICK_HIGH_SPEED_COLD) },
-/* 15 */	{ USB_DEVICE(USB_VID_HUMAX_COEX,
USB_PID_DVB_T_USB_STICK_HIGH_SPEED_WARM) },
-			{ }		/* Terminating entry */
+	[0]  = { USB_DEVICE(USB_VID_DIBCOM,
+			    USB_PID_DIBCOM_MOD3001_COLD)
+	},
+	[1]  = { USB_DEVICE(USB_VID_DIBCOM,
+			    USB_PID_DIBCOM_MOD3001_WARM)
+	},
+	[2]  = { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,
+			    USB_PID_ULTIMA_TVBOX_USB2_COLD)
+	},
+	[3]  = { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,
+			    // ( ? )
+			    USB_PID_ULTIMA_TVBOX_USB2_WARM)
+	},
+	[4]  = { USB_DEVICE(USB_VID_LITEON,
+			    USB_PID_LITEON_DVB_T_COLD)
+	},
+	[5]  = { USB_DEVICE(USB_VID_LITEON,
+			    USB_PID_LITEON_DVB_T_WARM)
+	},
+	[6]  = { USB_DEVICE(USB_VID_EMPIA,
+			    USB_PID_DIGIVOX_MINI_SL_COLD)
+	},
+	[7]  = { USB_DEVICE(USB_VID_EMPIA,
+			    USB_PID_DIGIVOX_MINI_SL_WARM)
+	},
+	[8]  = { USB_DEVICE(USB_VID_GRANDTEC,
+			    USB_PID_GRANDTEC_DVBT_USB2_COLD)
+	},
+	[9]  = { USB_DEVICE(USB_VID_GRANDTEC,
+			    USB_PID_GRANDTEC_DVBT_USB2_WARM)
+	},
+	[10] = { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,
+			    USB_PID_ARTEC_T14_COLD)
+	},
+	[11] = { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,
+			    USB_PID_ARTEC_T14_WARM)
+	},
+	[12] = { USB_DEVICE(USB_VID_LEADTEK,
+			    USB_PID_WINFAST_DTV_DONGLE_COLD)
+	},
+	[13] = { USB_DEVICE(USB_VID_LEADTEK,
+			    USB_PID_WINFAST_DTV_DONGLE_WARM)
+	},
+	[14] = { USB_DEVICE(USB_VID_HUMAX_COEX,
+			    USB_PID_DVB_T_USB_STICK_HIGH_SPEED_COLD)
+	},
+	[15] = { USB_DEVICE(USB_VID_HUMAX_COEX,
+			    USB_PID_DVB_T_USB_STICK_HIGH_SPEED_WARM)
+	},
+	{ }		/* Terminating entry */
 };
 MODULE_DEVICE_TABLE (usb, dibusb_dib3000mc_table);

-- 
2.35.1