make logarithm stuff static (conflicts; BTW, we now have already

two copies of this cruft -> should be factored out)

2 files changed, 17 insertions, 17 deletions

diff --git a/linux/drivers/media/dvb/frontends/or51132.c b/linux/drivers/media/dvb/frontends/or51132.c
index 6183e83ad..c8ba1b5f4 100644
--- a/linux/drivers/media/dvb/frontends/or51132.c
+++ b/linux/drivers/media/dvb/frontends/or51132.c
@@ -422,7 +422,7 @@ static int or51132_read_status(struct dvb_frontend* fe, fe_status_t* status)
 }
 
 /* log10-1 table at .5 increments from 1 to 100.5 */
-unsigned int i100x20log10[] = {
+static unsigned int i100x20log10[] = {
      0,  352,  602,  795,  954, 1088, 1204, 1306, 1397, 1480,
   1556, 1625, 1690, 1750, 1806, 1858, 1908, 1955, 2000, 2042,
   2082, 2121, 2158, 2193, 2227, 2260, 2292, 2322, 2352, 2380,
@@ -445,9 +445,9 @@ unsigned int i100x20log10[] = {
   3964, 3969, 3973, 3978, 3982, 3986, 3991, 3995, 4000, 4004,
 };
 
-unsigned int denom[] = {1,1,100,1000,10000,100000,1000000,10000000,100000000};
+static unsigned int denom[] = {1,1,100,1000,10000,100000,1000000,10000000,100000000};
 
-unsigned int i20Log10(unsigned short val)
+static unsigned int i20Log10(unsigned short val)
 {
 	unsigned int rntval = 100;
 	unsigned int tmp = val;
@@ -470,7 +470,7 @@ static int or51132_read_signal_strength(struct dvb_frontend* fe, u16* strength)
 	u8 rcvr_stat;
 	u16 snr_equ;
 	int usK;
-	
+
 	snd_buf[0]=0x04;
 	snd_buf[1]=0x02; /* SNR after Equalizer */
 	msleep(30); /* 30ms */
diff --git a/linux/drivers/media/dvb/frontends/or51211.c b/linux/drivers/media/dvb/frontends/or51211.c
index 1b0ff61c6..f8525f585 100644
--- a/linux/drivers/media/dvb/frontends/or51211.c
+++ b/linux/drivers/media/dvb/frontends/or51211.c
@@ -52,7 +52,7 @@ struct or51211_state {
 
 	struct i2c_adapter* i2c;
 	struct dvb_frontend_ops ops;
-    
+
 	/* Configuration settings */
 	const struct or51211_config* config;
 
@@ -72,9 +72,9 @@ static int i2c_writebytes (struct or51211_state* state, u8 reg, u8 *buf,
 	int err;
 	struct i2c_msg msg;
 	msg.addr	= reg;
-	msg.flags 	= 0;
-	msg.len 	= len;
-	msg.buf 	= buf;
+	msg.flags	= 0;
+	msg.len		= len;
+	msg.buf		= buf;
 
 	if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) {
 		printk(KERN_WARNING "or51211: i2c_writebytes error "
@@ -89,10 +89,10 @@ static u8 i2c_readbytes (struct or51211_state* state, u8 reg, u8* buf, int len)
 {
 	int err;
 	struct i2c_msg msg;
-	msg.addr 	= reg;
-	msg.flags 	= I2C_M_RD;
-	msg.len 	= len;
-	msg.buf 	= buf;
+	msg.addr	= reg;
+	msg.flags	= I2C_M_RD;
+	msg.len		= len;
+	msg.buf		= buf;
 
 	if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) {
 		printk(KERN_WARNING "or51211: i2c_readbytes error "
@@ -103,7 +103,7 @@ static u8 i2c_readbytes (struct or51211_state* state, u8 reg, u8* buf, int len)
 	return 0;
 }
 
-static int or51211_load_firmware (struct dvb_frontend* fe, 
+static int or51211_load_firmware (struct dvb_frontend* fe,
 				  const struct firmware *fw)
 {
 	struct or51211_state* state = fe->demodulator_priv;
@@ -254,7 +254,7 @@ static int or51211_set_parameters(struct dvb_frontend* fe,
 
 		/* Set to ATSC mode */
 		or51211_setmode(fe,0);
-		
+
 		/* Update current frequency */
 		state->current_frequency = param->frequency;
 	}
@@ -291,7 +291,7 @@ static int or51211_read_status(struct dvb_frontend* fe, fe_status_t* status)
 }
 
 /* log10-1 table at .5 increments from 1 to 100.5 */
-unsigned int i100x20log10[] = {
+static unsigned int i100x20log10[] = {
 		0,  352,  602,  795,  954, 1088, 1204, 1306, 1397, 1480,
 	 1556, 1625, 1690, 1750, 1806, 1858, 1908, 1955, 2000, 2042,
 	 2082, 2121, 2158, 2193, 2227, 2260, 2292, 2322, 2352, 2380,
@@ -314,9 +314,9 @@ unsigned int i100x20log10[] = {
 	 3964, 3969, 3973, 3978, 3982, 3986, 3991, 3995, 4000, 4004,
 };
 
-unsigned int denom[] = {1,1,100,1000,10000,100000,1000000,10000000,100000000};
+static unsigned int denom[] = {1,1,100,1000,10000,100000,1000000,10000000,100000000};
 
-unsigned int i20Log10(unsigned short val)
+static unsigned int i20Log10(unsigned short val)
 {
 	unsigned int rntval = 100;
 	unsigned int tmp = val;