[PATCH] staging: comedi: ni_pcimio: remove old unused code

[PATCH] staging: comedi: ni_pcimio: remove old unused code

[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.

Signed-off-by: Deepak R Varma <mh12gx2825@gmail.com>
---
 drivers/staging/comedi/drivers/ni_pcimio.c | 48 ----------------------
 1 file changed, 48 deletions(-)

diff --git a/drivers/staging/comedi/drivers/ni_pcimio.c b/drivers/staging/comedi/drivers/ni_pcimio.c
index 7c82d5f9778f..d8e34d2e1104 100644
--- a/drivers/staging/comedi/drivers/ni_pcimio.c
+++ b/drivers/staging/comedi/drivers/ni_pcimio.c
@@ -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,
-- 
2.17.1

Re: [Outreachy kernel] [PATCH] staging: comedi: ni_pcimio: remove old unused code

[Greg KH]

On Wed, Mar 11, 2020 at 04:14:08AM +0530, Deepak R Varma wrote:
> 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.
> 
> Signed-off-by: Deepak R Varma <mh12gx2825@gmail.com>
> ---
>  drivers/staging/comedi/drivers/ni_pcimio.c | 48 ----------------------
>  1 file changed, 48 deletions(-)

Why did you send this same patch twice?

confused,

greg k-h

Re: [Outreachy kernel] [PATCH] staging: comedi: ni_pcimio: remove old unused code

[Deepak Varma]

[-- Attachment #1.1: Type: text/plain, Size: 780 bytes --]



On Wednesday, 11 March 2020 12:33:18 UTC+5:30, Greg KH wrote:
>
> On Wed, Mar 11, 2020 at 04:14:08AM +0530, Deepak R Varma wrote: 
> > 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. 
> > 
> > Signed-off-by: Deepak R Varma <mh12g...@gmail.com <javascript:>> 
> > --- 
> >  drivers/staging/comedi/drivers/ni_pcimio.c | 48 ---------------------- 
> >  1 file changed, 48 deletions(-) 
>
> Why did you send this same patch twice? 
>
> confused, 
>
> greg k-h 
>

I sent three separate patches for comedi drivers dt2801, dt282x and 
ni_pcimio. Did I do something wrong?  

Deepak.

[-- Attachment #1.2: Type: text/html, Size: 1261 bytes --]