Skip to contentSkip to conversation

staging: comedi: ni_pcimio: remove old unused code

PATCH In review Deepak R Varma 2 participants 3 messages Mar 22, 2020 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging: comedi: ni_pcimio: remove old unused code

Found multiple #if 0 code blocks that appear to have never been used. Additinal comments around intended functionality may be introduced separately. As these commented code blocks do not appear to be ever useful, they can be removed.

---
Resending patch for review. No changes since last version.

 drivers/staging/comedi/drivers/ni_pcimio.c | 48 ----------------------
 1 file changed, 48 deletions(-)
drivers/staging/comedi/drivers/ni_pcimio.c +0 -48
index 7c82d5f9778f..d8e34d2e1104 100644
@@ -481,43 +481,6 @@ static const struct ni_board_struct ni_boards[] = {
 		.ao_speed	= 250,
 		.caldac		= { ad8804, ad8804 },
 	},
-#if 0
-	/* The 6115 boards probably need their own driver */
-	[BOARD_PCI6115] = {	/* .device_id = 0x2ed0, */
-		.name		= "pci-6115",
-		.n_adchan	= 4,
-		.ai_maxdata	= 0x0fff,
-		.ai_fifo_depth	= 8192,
-		.gainlkup	= ai_gain_611x,
-		.ai_speed	= 100,
-		.n_aochan	= 2,
-		.ao_maxdata	= 0xffff,
-		.ao_671x	= 1,
-		.ao_fifo_depth	= 2048,
-		.ao_speed	= 250,
-		.reg_611x	= 1,
-		/* XXX */
-		.caldac		= { ad8804_debug, ad8804_debug, ad8804_debug },
-	},
-#endif
-#if 0
-	[BOARD_PXI6115] = {	/* .device_id = ????, */
-		.name		= "pxi-6115",
-		.n_adchan	= 4,
-		.ai_maxdata	= 0x0fff,
-		.ai_fifo_depth	= 8192,
-		.gainlkup	= ai_gain_611x,
-		.ai_speed	= 100,
-		.n_aochan	= 2,
-		.ao_maxdata	= 0xffff,
-		.ao_671x	= 1,
-		.ao_fifo_depth	= 2048,
-		.ao_speed	= 250,
-		.reg_611x	= 1,
-		/* XXX */
-		.caldac		= { ad8804_debug, ad8804_debug, ad8804_debug },
-	},
-#endif
 	[BOARD_PCI6711] = {
 		.name = "pci-6711",
 		.n_aochan	= 4,
@@ -569,17 +532,6 @@ static const struct ni_board_struct ni_boards[] = {
 		.reg_type	= ni_reg_6711,
 		.caldac		= { ad8804_debug },
 	},
-#if 0
-	[BOARD_PXI6731] = {	/* .device_id = ????, */
-		.name		= "pxi-6731",
-		.n_aochan	= 4,
-		.ao_maxdata	= 0xffff,
-		.ao_fifo_depth	= 8192,
-		.ao_range_table	= &range_bipolar10,
-		.reg_type	= ni_reg_6711,
-		.caldac		= { ad8804_debug },
-	},
-#endif
 	[BOARD_PCI6733] = {
 		.name		= "pci-6733",
 		.n_aochan	= 8,
Signature · 1 line
2.17.1
maintainer
#1 lore raw
Quoted 9 lines · Deepak R Varma

Found multiple #if 0 code blocks that appear to have never been used. Additinal comments around intended functionality may be introduced separately. As these commented code blocks do not appear to be ever useful, they can be removed.

---
Resending patch for review. No changes since last version.

Last time I thought I said to leave these as-is as they document devices that people might have and would be able to add to the driver easily.

So I'm not going to take this patch this time either, sorry.

greg k-h

#2 lore raw
Quoted 8 lines · Greg KH
Quoted 7 lines · Deepak R Varma

Found multiple #if 0 code blocks that appear to have never been used. Additinal comments around intended functionality may be introduced separately. As these commented code blocks do not appear to be ever useful, they can be removed.

Quoted 7 lines
Quoted 2 lines

---
Resending patch for review. No changes since last version.

Last time I thought I said to leave these as-is as they document devices that people might have and would be able to add to the driver easily.

So I'm not going to take this patch this time either, sorry.

That comment was for a different patch for dt2801 driver patch. I will discard this one too. No problem.

Thank you for your time.
Deepak.

Quoted 2 lines

greg k-h