- make needlessly global code static

- whitespace and newline cleanups
Thanks to Adrian Bunk <bunk@stusta.de>

2 files changed, 9 insertions, 36 deletions

diff --git a/linux/drivers/media/dvb/bt8xx/bt878.c b/linux/drivers/media/dvb/bt8xx/bt878.c
index 0973588d4..7968bfef3 100644
--- a/linux/drivers/media/dvb/bt8xx/bt878.c
+++ b/linux/drivers/media/dvb/bt8xx/bt878.c
@@ -559,22 +559,11 @@ static struct pci_driver bt878_pci_driver = {
 
 static int bt878_pci_driver_registered = 0;
 
-/* This will be used later by dvb-bt8xx to only use the audio
- * dma of certain cards */
-int bt878_find_audio_dma(void)
-{
-	// pci_register_driver(&bt878_pci_driver);
-	bt878_pci_driver_registered = 1;
-	return 0;
-}
-
-EXPORT_SYMBOL(bt878_find_audio_dma);
-
 /*******************************/
 /* Module management functions */
 /*******************************/
 
-int bt878_init_module(void)
+static int bt878_init_module(void)
 {
 	bt878_num = 0;
 	bt878_pci_driver_registered = 0;
@@ -586,13 +575,13 @@ int bt878_init_module(void)
 /*
         bt878_check_chipset();
 */
-	/* later we register inside of bt878_find_audio_dma
+	/* later we register inside of bt878_find_audio_dma()
 	 * because we may want to ignore certain cards */
 	bt878_pci_driver_registered = 1;
 	return pci_module_init(&bt878_pci_driver);
 }
 
-void bt878_cleanup_module(void)
+static void bt878_cleanup_module(void)
 {
 	if (bt878_pci_driver_registered) {
 		bt878_pci_driver_registered = 0;
@@ -601,8 +590,6 @@ void bt878_cleanup_module(void)
 	return;
 }
 
-EXPORT_SYMBOL(bt878_init_module);
-EXPORT_SYMBOL(bt878_cleanup_module);
 module_init(bt878_init_module);
 module_exit(bt878_cleanup_module);
 
diff --git a/linux/drivers/media/dvb/bt8xx/dst.c b/linux/drivers/media/dvb/bt8xx/dst.c
index 49c46d7f8..e175ed967 100644
--- a/linux/drivers/media/dvb/bt8xx/dst.c
+++ b/linux/drivers/media/dvb/bt8xx/dst.c
@@ -33,7 +33,6 @@
 #include "dst_priv.h"
 #include "dst.h"
 
-
 struct dst_state {
 
 	struct i2c_adapter* i2c;
@@ -69,12 +68,10 @@ struct dst_state {
 	fe_bandwidth_t bandwidth;
 };
 
-
-
-unsigned int dst_verbose = 0;
+static unsigned int dst_verbose = 0;
 MODULE_PARM(dst_verbose, "i");
 MODULE_PARM_DESC(dst_verbose, "verbose startup messages, default is 1 (yes)");
-unsigned int dst_debug = 0;
+static unsigned int dst_debug = 0;
 MODULE_PARM(dst_debug, "i");
 MODULE_PARM_DESC(dst_debug, "debug messages, default is 0 (no)");
 
@@ -138,6 +135,7 @@ static int dst_gpio_inb(struct dst_state *state, u8 * result)
 		dprintk("%s: dst_gpio_inb error (err == %i)\n", __FUNCTION__, err);
 		return -EREMOTEIO;
 	}
+	
 	*result = (u8) rd_packet.rd.value;
 	return 0;
 }
@@ -378,7 +376,6 @@ static int dst_set_inversion(struct dst_state* state, fe_spectral_inversion_t in
 	return 0;
 }
 
-
 static int dst_set_fec(struct dst_state* state, fe_code_rate_t fec)
 {
 	state->fec = fec;
@@ -425,7 +422,6 @@ static int dst_set_symbolrate(struct dst_state* state, u32 srate)
 	return 0;
 }
 
-
 static u8 dst_check_sum(u8 * buf, u32 len)
 {
 	u32 i;
@@ -438,14 +434,14 @@ static u8 dst_check_sum(u8 * buf, u32 len)
 	return ((~val) + 1);
 }
 
-typedef struct dst_types {
+struct dst_types {
 	char *mstr;
 	int offs;
 	u8 dst_type;
 	u32 type_flags;
-} DST_TYPES;
+};
 
-struct dst_types dst_tlist[] = {
+static struct dst_types dst_tlist[] = {
 	{"DST-020", 0, DST_TYPE_IS_SAT, DST_TYPE_HAS_SYMDIV},
 	{"DST-030", 0, DST_TYPE_IS_SAT, DST_TYPE_HAS_TS204 | DST_TYPE_HAS_NEWTUNE},
 	{"DST-03T", 0, DST_TYPE_IS_SAT, DST_TYPE_HAS_SYMDIV | DST_TYPE_HAS_TS204},
@@ -750,13 +746,6 @@ static int dst_write_tuna(struct dvb_frontend* fe)
 	return dst_get_tuna(state);
 }
 
-
-
-
-
-
-
-
 /*
  * line22k0    0x00, 0x09, 0x00, 0xff, 0x01, 0x00, 0x00, 0x00
  * line22k1    0x00, 0x09, 0x01, 0xff, 0x01, 0x00, 0x00, 0x00
@@ -826,7 +815,6 @@ static int dst_set_voltage(struct dvb_frontend* fe, fe_sec_voltage_t voltage)
 	return 0;
 }
 
-
 static int dst_set_tone(struct dvb_frontend* fe, fe_sec_tone_mode_t tone)
 {
 	u8 *val;
@@ -854,7 +842,6 @@ static int dst_set_tone(struct dvb_frontend* fe, fe_sec_tone_mode_t tone)
 	return 0;
 }
 
-
 static int dst_init(struct dvb_frontend* fe)
 {
 	struct dst_state* state = (struct dst_state*) fe->demodulator_priv;
@@ -1095,7 +1082,6 @@ static struct dvb_frontend_ops dst_dvbc_ops = {
 	.read_snr = dst_read_snr,
 };
 
-
 MODULE_DESCRIPTION("DST DVB-S/T/C Combo Frontend driver");
 MODULE_AUTHOR("Jamie Honan");
 MODULE_LICENSE("GPL");