Skip to contentSkip to conversation

Terratec Cinergy C PCI HD (CI)

PATCH In review Igor M. Liplianin 3 participants 4 messages May 9, 2012 – May 15, 2012 Media (V4L/DVB)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Terratec Cinergy C PCI HD (CI)

This patch seems for rectifying a typo. But actually the difference between mantis_vp2040.c and mantis_vp2033.c code is a card name only.

linux/drivers/media/dvb/mantis/mantis_cards.c +1 -1
diff -r 990a92e2410f linux/drivers/media/dvb/mantis/mantis_cards.c
@@ -276,7 +276,7 @@
 	MAKE_ENTRY(TWINHAN_TECHNOLOGIES, MANTIS_VP_2033_DVB_C, &vp2033_config),
 	MAKE_ENTRY(TWINHAN_TECHNOLOGIES, MANTIS_VP_2040_DVB_C, &vp2040_config),
 	MAKE_ENTRY(TECHNISAT, CABLESTAR_HD2, &vp2040_config),
-	MAKE_ENTRY(TERRATEC, CINERGY_C, &vp2033_config),
+	MAKE_ENTRY(TERRATEC, CINERGY_C, &vp2040_config),
 	MAKE_ENTRY(TWINHAN_TECHNOLOGIES, MANTIS_VP_3030_DVB_T, &vp3030_config),
 	{ }
 };
linux/drivers/media/dvb/mantis/mantis_core.c +1 -1
diff -r 990a92e2410f linux/drivers/media/dvb/mantis/mantis_core.c
@@ -121,7 +121,7 @@
 		mantis->hwconfig = &vp2033_mantis_config;
 		break;
 	case MANTIS_VP_2040_DVB_C:	/* VP-2040 */
-	case TERRATEC_CINERGY_C_PCI:	/* VP-2040 clone */
+	case CINERGY_C:	/* VP-2040 clone */
 	case TECHNISAT_CABLESTAR_HD2:
 		mantis->hwconfig = &vp2040_mantis_config;
 		break;
#1 lore raw
Quoted 2 lines · Igor M. Liplianin

This patch seems for rectifying a typo. But actually the difference between mantis_vp2040.c and mantis_vp2033.c code is a card name only.

Yes, there are major code duplication issues in this driver.

linux/drivers/media/dvb/mantis/mantis_cards.c line 282

Quoted 13 lines

diff -r 990a92e2410f linux/drivers/media/dvb/mantis/mantis_cards.c

linux/drivers/media/dvb/mantis/mantis_cards.c +1 -1
@@ -276,7 +276,7 @@
 	MAKE_ENTRY(TWINHAN_TECHNOLOGIES, MANTIS_VP_2033_DVB_C, &vp2033_config),
 	MAKE_ENTRY(TWINHAN_TECHNOLOGIES, MANTIS_VP_2040_DVB_C, &vp2040_config),
 	MAKE_ENTRY(TECHNISAT, CABLESTAR_HD2, &vp2040_config),
-	MAKE_ENTRY(TERRATEC, CINERGY_C, &vp2033_config),
+	MAKE_ENTRY(TERRATEC, CINERGY_C, &vp2040_config),
 	MAKE_ENTRY(TWINHAN_TECHNOLOGIES, MANTIS_VP_3030_DVB_T, &vp3030_config),
 	{ }
 };

What's the point? It's a constructed difference. Makes more sense to refactor and merge all the duplicated code instead of maintaining this meaningless code split.

linux/drivers/media/dvb/mantis/mantis_core.c line 127

Quoted 12 lines

diff -r 990a92e2410f linux/drivers/media/dvb/mantis/mantis_core.c

linux/drivers/media/dvb/mantis/mantis_core.c +1 -1
@@ -121,7 +121,7 @@
 		mantis->hwconfig = &vp2033_mantis_config;
 		break;
 	case MANTIS_VP_2040_DVB_C:	/* VP-2040 */
-	case TERRATEC_CINERGY_C_PCI:	/* VP-2040 clone */
+	case CINERGY_C:	/* VP-2040 clone */
 	case TECHNISAT_CABLESTAR_HD2:
 		mantis->hwconfig = &vp2040_mantis_config;
 		break;

And this file should never have been merged into the mainline kernel at all. If you wonder how a bug like that could survive without being noticed, then the explanation is simple: This code has never been built as part of the driver in the mainline kernel.

I tried submitting a cleanup patch to have it removed a long time ago:
http://patchwork.linuxtv.org/patch/3680/
but it doesn't seem to have gone anywhere, like most of the patches for this driver - silently ignored until everyone forgets it and moves on.

The code could certainly benefit from a major cleanup, but I don't see how that would ever happen. It sort of works. Better leave it there and spend valuable time elsewhere.

Bjørn

#2 lore raw
Quoted 51 lines · On 9 мая 2012 20:57:49 Bjørn Mork wrote:
Quoted 3 lines · Igor M. Liplianin

This patch seems for rectifying a typo. But actually the difference between
mantis_vp2040.c and mantis_vp2033.c code is a card name only.

Yes, there are major code duplication issues in this driver.

Quoted 7 lines

diff -r 990a92e2410f linux/drivers/media/dvb/mantis/mantis_cards.c
--- a/linux/drivers/media/dvb/mantis/mantis_cards.c Wed May 09 01:37:05
2012 +0300 +++ b/linux/drivers/media/dvb/mantis/mantis_cards.c Wed May 09
14:04:31 2012 +0300 @@ -276,7 +276,7 @@

linux/drivers/media/dvb/mantis/mantis_cards.c +0 -0
 	MAKE_ENTRY(TWINHAN_TECHNOLOGIES, MANTIS_VP_2033_DVB_C, &vp2033_config),

linux/drivers/media/dvb/mantis/mantis_cards.c line 282

Quoted 10 lines
linux/drivers/media/dvb/mantis/mantis_cards.c +1 -1
 	MAKE_ENTRY(TWINHAN_TECHNOLOGIES, MANTIS_VP_2040_DVB_C, &vp2040_config),
 	MAKE_ENTRY(TECHNISAT, CABLESTAR_HD2, &vp2040_config),
 
-	MAKE_ENTRY(TERRATEC, CINERGY_C, &vp2033_config),
+	MAKE_ENTRY(TERRATEC, CINERGY_C, &vp2040_config),
 
 	MAKE_ENTRY(TWINHAN_TECHNOLOGIES, MANTIS_VP_3030_DVB_T, &vp3030_config),
 	{ }
 
 };

What's the point? It's a constructed difference. Makes more sense to refactor and merge all the duplicated code instead of maintaining this meaningless code split.

Quoted 6 lines

diff -r 990a92e2410f linux/drivers/media/dvb/mantis/mantis_core.c
--- a/linux/drivers/media/dvb/mantis/mantis_core.c Wed May 09 01:37:05
2012 +0300 +++ b/linux/drivers/media/dvb/mantis/mantis_core.c Wed May 09
14:04:31 2012 +0300 @@ -121,7 +121,7 @@

linux/drivers/media/dvb/mantis/mantis_core.c +0 -0
 		mantis->hwconfig = &vp2033_mantis_config;

linux/drivers/media/dvb/mantis/mantis_core.c line 127

Quoted 10 lines
linux/drivers/media/dvb/mantis/mantis_core.c +1 -1
 		break;
 
 	case MANTIS_VP_2040_DVB_C:	/* VP-2040 */
 
-	case TERRATEC_CINERGY_C_PCI:	/* VP-2040 clone */
+	case CINERGY_C:	/* VP-2040 clone */
 
 	case TECHNISAT_CABLESTAR_HD2:
 		mantis->hwconfig = &vp2040_mantis_config;
 		break;

And this file should never have been merged into the mainline kernel at all. If you wonder how a bug like that could survive without being noticed, then the explanation is simple: This code has never been built as part of the driver in the mainline kernel.

Quoted 2 lines

I tried submitting a cleanup patch to have it removed a long time ago:
http://patchwork.linuxtv.org/patch/3680/

Oh, I wasn't aware of that.

Quoted 6 lines

but it doesn't seem to have gone anywhere, like most of the patches for this driver - silently ignored until everyone forgets it and moves on.

The code could certainly benefit from a major cleanup, but I don't see how that would ever happen. It sort of works. Better leave it there and spend valuable time elsewhere.

This patch is just a remainder. Seriously, I don't anticipate something.

Igor.

Quoted 4 lines

Bjørn

Signature · 2 lines
Igor M. Liplianin
Microsoft Windows Free Zone - Linux used for all Computing Tasks