Skip to contentSkip to conversation

parport: serial: Convert comments to indices in cards assignment

PATCH In review Andy Shevchenko 1 participant 3 messages Jan 22 – Feb 6 Parallel port

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 parport: serial: Convert comments to indices in cards assignment

Instead of using comments, use explicit indices. This will help to address an entry in an array by known index and leads to more robust code.

---
 drivers/parport/parport_serial.c | 94 ++++++++++++++++----------------
 1 file changed, 47 insertions(+), 47 deletions(-)
drivers/parport/parport_serial.c +47 -47
index 24d4f3a3ec3d..eb8ab21e0acf 100644
@@ -119,53 +119,53 @@ static int netmos_parallel_init(struct pci_dev *dev, struct parport_pc_pci *par,
 }
 
 static struct parport_pc_pci cards[] = {
-	/* titan_110l */		{ 1, { { 3, -1 }, } },
-	/* titan_210l */		{ 1, { { 3, -1 }, } },
-	/* netmos_9xx5_combo */		{ 1, { { 2, -1 }, }, netmos_parallel_init },
-	/* netmos_9855 */		{ 1, { { 0, -1 }, }, netmos_parallel_init },
-	/* netmos_9855_2p */		{ 2, { { 0, -1 }, { 2, -1 }, } },
-	/* netmos_9900 */		{1, { { 3, 4 }, }, netmos_parallel_init },
-	/* netmos_9900_2p */		{2, { { 0, 1 }, { 3, 4 }, } },
-	/* netmos_99xx_1p */		{1, { { 0, 1 }, } },
-	/* avlab_1s1p     */		{ 1, { { 1, 2}, } },
-	/* avlab_1s2p     */		{ 2, { { 1, 2}, { 3, 4 },} },
-	/* avlab_2s1p     */		{ 1, { { 2, 3}, } },
-	/* siig_1s1p_10x */		{ 1, { { 3, 4 }, } },
-	/* siig_2s1p_10x */		{ 1, { { 4, 5 }, } },
-	/* siig_2p1s_20x */		{ 2, { { 1, 2 }, { 3, 4 }, } },
-	/* siig_1s1p_20x */		{ 1, { { 1, 2 }, } },
-	/* siig_2s1p_20x */		{ 1, { { 2, 3 }, } },
-	/* timedia_4078a */		{ 1, { { 2, -1 }, } },
-	/* timedia_4079h */             { 1, { { 2, 3 }, } },
-	/* timedia_4085h */             { 2, { { 2, -1 }, { 4, -1 }, } },
-	/* timedia_4088a */             { 2, { { 2, 3 }, { 4, 5 }, } },
-	/* timedia_4089a */             { 2, { { 2, 3 }, { 4, 5 }, } },
-	/* timedia_4095a */             { 2, { { 2, 3 }, { 4, 5 }, } },
-	/* timedia_4096a */             { 2, { { 2, 3 }, { 4, 5 }, } },
-	/* timedia_4078u */             { 1, { { 2, -1 }, } },
-	/* timedia_4079a */             { 1, { { 2, 3 }, } },
-	/* timedia_4085u */             { 2, { { 2, -1 }, { 4, -1 }, } },
-	/* timedia_4079r */             { 1, { { 2, 3 }, } },
-	/* timedia_4079s */             { 1, { { 2, 3 }, } },
-	/* timedia_4079d */             { 1, { { 2, 3 }, } },
-	/* timedia_4079e */             { 1, { { 2, 3 }, } },
-	/* timedia_4079f */             { 1, { { 2, 3 }, } },
-	/* timedia_9079a */             { 1, { { 2, 3 }, } },
-	/* timedia_9079b */             { 1, { { 2, 3 }, } },
-	/* timedia_9079c */             { 1, { { 2, 3 }, } },
-	/* wch_ch353_1s1p*/             { 1, { { 1, -1}, } },
-	/* wch_ch353_2s1p*/             { 1, { { 2, -1}, } },
-	/* wch_ch382_0s1p*/		{ 1, { { 2, -1}, } },
-	/* wch_ch382_2s1p*/             { 1, { { 2, -1}, } },
-	/* brainboxes_5s1p */           { 1, { { 3, -1 }, } },
-	/* sunix_4008a */		{ 1, { { 1, 2 }, } },
-	/* sunix_5069a */		{ 1, { { 1, 2 }, } },
-	/* sunix_5079a */		{ 1, { { 1, 2 }, } },
-	/* sunix_5099a */		{ 1, { { 1, 2 }, } },
-	/* brainboxes_uc257 */	{ 1, { { 3, -1 }, } },
-	/* brainboxes_is300 */	{ 1, { { 3, -1 }, } },
-	/* brainboxes_uc414 */  { 1, { { 3, -1 }, } },
-	/* brainboxes_px263 */	{ 1, { { 3, -1 }, } },
+	[titan_110l]		= { 1, { { 3, -1 }, } },
+	[titan_210l]		= { 1, { { 3, -1 }, } },
+	[netmos_9xx5_combo]	= { 1, { { 2, -1 }, }, netmos_parallel_init },
+	[netmos_9855]		= { 1, { { 0, -1 }, }, netmos_parallel_init },
+	[netmos_9855_2p]	= { 2, { { 0, -1 }, { 2, -1 }, } },
+	[netmos_9900]		= {1, { { 3, 4 }, }, netmos_parallel_init },
+	[netmos_9900_2p]	= {2, { { 0, 1 }, { 3, 4 }, } },
+	[netmos_99xx_1p]	= {1, { { 0, 1 }, } },
+	[avlab_1s1p]		= { 1, { { 1, 2}, } },
+	[avlab_1s2p]		= { 2, { { 1, 2}, { 3, 4 },} },
+	[avlab_2s1p]		= { 1, { { 2, 3}, } },
+	[siig_1s1p_10x]		= { 1, { { 3, 4 }, } },
+	[siig_2s1p_10x]		= { 1, { { 4, 5 }, } },
+	[siig_2p1s_20x]		= { 2, { { 1, 2 }, { 3, 4 }, } },
+	[siig_1s1p_20x]		= { 1, { { 1, 2 }, } },
+	[siig_2s1p_20x]		= { 1, { { 2, 3 }, } },
+	[timedia_4078a]		= { 1, { { 2, -1 }, } },
+	[timedia_4079h]		= { 1, { { 2, 3 }, } },
+	[timedia_4085h]		= { 2, { { 2, -1 }, { 4, -1 }, } },
+	[timedia_4088a]		= { 2, { { 2, 3 }, { 4, 5 }, } },
+	[timedia_4089a]		= { 2, { { 2, 3 }, { 4, 5 }, } },
+	[timedia_4095a]		= { 2, { { 2, 3 }, { 4, 5 }, } },
+	[timedia_4096a]		= { 2, { { 2, 3 }, { 4, 5 }, } },
+	[timedia_4078u]		= { 1, { { 2, -1 }, } },
+	[timedia_4079a]		= { 1, { { 2, 3 }, } },
+	[timedia_4085u]		= { 2, { { 2, -1 }, { 4, -1 }, } },
+	[timedia_4079r]		= { 1, { { 2, 3 }, } },
+	[timedia_4079s]		= { 1, { { 2, 3 }, } },
+	[timedia_4079d]		= { 1, { { 2, 3 }, } },
+	[timedia_4079e]		= { 1, { { 2, 3 }, } },
+	[timedia_4079f]		= { 1, { { 2, 3 }, } },
+	[timedia_9079a]		= { 1, { { 2, 3 }, } },
+	[timedia_9079b]		= { 1, { { 2, 3 }, } },
+	[timedia_9079c]		= { 1, { { 2, 3 }, } },
+	[wch_ch353_1s1p]	= { 1, { { 1, -1}, } },
+	[wch_ch353_2s1p]	= { 1, { { 2, -1}, } },
+	[wch_ch382_0s1p]	= { 1, { { 2, -1}, } },
+	[wch_ch382_2s1p]	= { 1, { { 2, -1}, } },
+	[brainboxes_5s1p]	= { 1, { { 3, -1 }, } },
+	[sunix_4008a]		= { 1, { { 1, 2 }, } },
+	[sunix_5069a]		= { 1, { { 1, 2 }, } },
+	[sunix_5079a]		= { 1, { { 1, 2 }, } },
+	[sunix_5099a]		= { 1, { { 1, 2 }, } },
+	[brainboxes_uc257]	= { 1, { { 3, -1 }, } },
+	[brainboxes_is300]	= { 1, { { 3, -1 }, } },
+	[brainboxes_uc414]	= { 1, { { 3, -1 }, } },
+	[brainboxes_px263]	= { 1, { { 3, -1 }, } },
 };
 
 static struct pci_device_id parport_serial_pci_tbl[] = {
Signature · 1 line
2.50.1
#1 lore raw
Quoted 3 lines · Andy Shevchenko

Instead of using comments, use explicit indices. This will help to address an entry in an array by known index and leads to more robust code.

Any comments on this?

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#2 lore raw
In reply to Andy Shevchenko
Quoted 3 lines · Andy Shevchenko

Instead of using comments, use explicit indices. This will help to address an entry in an array by known index and leads to more robust code.

Sudip, any comments on this?

Signature · 2 lines
With Best Regards,
Andy Shevchenko