Re: [linux-dvb-maintainer] PATCH: DVB bt8xx in 2.6.10

[Arne Ahrend <aahrend@web.de>]

On Tue, 4 Jan 2005 19:11:53 +0100
Johannes Stezenbach <js@linuxtv.org> wrote:

> This approach has been discussed on the linux-dvb list and was rejected
> because of the huge #ifdef mess it creates (you just touched bt8xx, it's
> even worse for saa7146 based cards). The frontend drivers are
> tiny so I think you can afford to load some that aren't actually
> used by your hardware.


Ok, point acknowledged. The following tiny bit of cosmetic might
be of interest anyway.

Arne



diff -upr -X dontdiff linux-2.6.10-vanilla/drivers/media/dvb/bt8xx/dvb-bt8xx.c linux-2.6.10/drivers/media/dvb/bt8xx/dvb-bt8xx.c
--- linux-2.6.10-vanilla/drivers/media/dvb/bt8xx/dvb-bt8xx.c	2005-01-04 15:36:33.000000000 +0100
+++ linux-2.6.10/drivers/media/dvb/bt8xx/dvb-bt8xx.c	2005-01-05 00:57:19.000000000 +0100
@@ -220,7 +220,7 @@ static int microtune_mt7202dtf_request_f
 	return request_firmware(fw, name, &bt->bt->dev->dev);
 }
 
-struct sp887x_config microtune_mt7202dtf_config = {
+static struct sp887x_config microtune_mt7202dtf_config = {
 
 	.demod_address = 0x70,
 	.pll_set = microtune_mt7202dtf_pll_set,
diff -upr -X dontdiff linux-2.6.10-vanilla/drivers/media/dvb/bt8xx/dvb-bt8xx.h linux-2.6.10/drivers/media/dvb/bt8xx/dvb-bt8xx.h
--- linux-2.6.10-vanilla/drivers/media/dvb/bt8xx/dvb-bt8xx.h	2005-01-04 15:36:33.000000000 +0100
+++ linux-2.6.10/drivers/media/dvb/bt8xx/dvb-bt8xx.h	2005-01-05 00:58:39.000000000 +0100
@@ -22,6 +22,9 @@
  *
  */
 
+#ifndef DVB_BT8XX_H
+#define DVB_BT8XX_H
+
 #include <linux/i2c.h>
 #include "dvbdev.h"
 #include "dvb_net.h"
@@ -50,3 +53,5 @@ struct dvb_bt8xx_card {
 				
 	struct dvb_frontend* fe;
 };
+
+#endif /* DVB_BT8XX_H */