Commit d91b730d authored by Johannes Stezenbach's avatar Johannes Stezenbach Committed by Linus Torvalds

[PATCH] dvb: make needlessly global code static or drop it

- make needlessly global code static
- #if 0 the following unused global functions:
  - ttpci/av7110_hw.c: av7110_reset_arm
  - ttpci/av7110_hw.c: av7110_send_ci_cmd
- frontends/mt352.[ch]: drop mt352_read
Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarJohannes Stezenbach <js@linuxtv.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 5e9e7226
...@@ -102,11 +102,6 @@ static int mt352_read_register(struct mt352_state* state, u8 reg) ...@@ -102,11 +102,6 @@ static int mt352_read_register(struct mt352_state* state, u8 reg)
return b1[0]; return b1[0];
} }
int mt352_read(struct dvb_frontend *fe, u8 reg)
{
return mt352_read_register(fe->demodulator_priv,reg);
}
static int mt352_sleep(struct dvb_frontend* fe) static int mt352_sleep(struct dvb_frontend* fe)
{ {
static u8 mt352_softdown[] = { CLOCK_CTL, 0x20, 0x08 }; static u8 mt352_softdown[] = { CLOCK_CTL, 0x20, 0x08 };
...@@ -601,10 +596,3 @@ MODULE_LICENSE("GPL"); ...@@ -601,10 +596,3 @@ MODULE_LICENSE("GPL");
EXPORT_SYMBOL(mt352_attach); EXPORT_SYMBOL(mt352_attach);
EXPORT_SYMBOL(mt352_write); EXPORT_SYMBOL(mt352_write);
EXPORT_SYMBOL(mt352_read);
/*
* Local variables:
* c-basic-offset: 8
* compile-command: "make DVB=1"
* End:
*/
...@@ -61,7 +61,6 @@ extern struct dvb_frontend* mt352_attach(const struct mt352_config* config, ...@@ -61,7 +61,6 @@ extern struct dvb_frontend* mt352_attach(const struct mt352_config* config,
struct i2c_adapter* i2c); struct i2c_adapter* i2c);
extern int mt352_write(struct dvb_frontend* fe, u8* ibuf, int ilen); extern int mt352_write(struct dvb_frontend* fe, u8* ibuf, int ilen);
extern int mt352_read(struct dvb_frontend *fe, u8 reg);
#endif // MT352_H #endif // MT352_H
......
...@@ -274,7 +274,6 @@ extern void av7110_ir_exit (void); ...@@ -274,7 +274,6 @@ extern void av7110_ir_exit (void);
extern int i2c_writereg(struct av7110 *av7110, u8 id, u8 reg, u8 val); extern int i2c_writereg(struct av7110 *av7110, u8 id, u8 reg, u8 val);
extern u8 i2c_readreg(struct av7110 *av7110, u8 id, u8 reg); extern u8 i2c_readreg(struct av7110 *av7110, u8 id, u8 reg);
extern int msp_writereg(struct av7110 *av7110, u8 dev, u16 reg, u16 val); extern int msp_writereg(struct av7110 *av7110, u8 dev, u16 reg, u16 val);
extern int msp_readreg(struct av7110 *av7110, u8 dev, u16 reg, u16 *val);
extern int av7110_init_analog_module(struct av7110 *av7110); extern int av7110_init_analog_module(struct av7110 *av7110);
......
...@@ -104,7 +104,7 @@ u32 av7110_debiread(struct av7110 *av7110, u32 config, int addr, int count) ...@@ -104,7 +104,7 @@ u32 av7110_debiread(struct av7110 *av7110, u32 config, int addr, int count)
/* av7110 ARM core boot stuff */ /* av7110 ARM core boot stuff */
#if 0
void av7110_reset_arm(struct av7110 *av7110) void av7110_reset_arm(struct av7110 *av7110)
{ {
saa7146_setgpio(av7110->dev, RESET_LINE, SAA7146_GPIO_OUTLO); saa7146_setgpio(av7110->dev, RESET_LINE, SAA7146_GPIO_OUTLO);
...@@ -124,7 +124,7 @@ void av7110_reset_arm(struct av7110 *av7110) ...@@ -124,7 +124,7 @@ void av7110_reset_arm(struct av7110 *av7110)
av7110->arm_ready = 1; av7110->arm_ready = 1;
dprintk(1, "reset ARM\n"); dprintk(1, "reset ARM\n");
} }
#endif /* 0 */
static int waitdebi(struct av7110 *av7110, int adr, int state) static int waitdebi(struct av7110 *av7110, int adr, int state)
{ {
...@@ -335,7 +335,7 @@ int av7110_wait_msgstate(struct av7110 *av7110, u16 flags) ...@@ -335,7 +335,7 @@ int av7110_wait_msgstate(struct av7110 *av7110, u16 flags)
return 0; return 0;
} }
int __av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length) static int __av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length)
{ {
int i; int i;
unsigned long start; unsigned long start;
...@@ -455,7 +455,7 @@ int __av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length) ...@@ -455,7 +455,7 @@ int __av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length)
return 0; return 0;
} }
int av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length) static int av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length)
{ {
int ret; int ret;
...@@ -500,6 +500,7 @@ int av7110_fw_cmd(struct av7110 *av7110, int type, int com, int num, ...) ...@@ -500,6 +500,7 @@ int av7110_fw_cmd(struct av7110 *av7110, int type, int com, int num, ...)
return ret; return ret;
} }
#if 0
int av7110_send_ci_cmd(struct av7110 *av7110, u8 subcom, u8 *buf, u8 len) int av7110_send_ci_cmd(struct av7110 *av7110, u8 subcom, u8 *buf, u8 len)
{ {
int i, ret; int i, ret;
...@@ -521,6 +522,7 @@ int av7110_send_ci_cmd(struct av7110 *av7110, u8 subcom, u8 *buf, u8 len) ...@@ -521,6 +522,7 @@ int av7110_send_ci_cmd(struct av7110 *av7110, u8 subcom, u8 *buf, u8 len)
printk(KERN_ERR "dvb-ttpci: av7110_send_ci_cmd error %d\n", ret); printk(KERN_ERR "dvb-ttpci: av7110_send_ci_cmd error %d\n", ret);
return ret; return ret;
} }
#endif /* 0 */
int av7110_fw_request(struct av7110 *av7110, u16 *request_buf, int av7110_fw_request(struct av7110 *av7110, u16 *request_buf,
int request_buf_len, u16 *reply_buf, int reply_buf_len) int request_buf_len, u16 *reply_buf, int reply_buf_len)
...@@ -593,7 +595,7 @@ int av7110_fw_request(struct av7110 *av7110, u16 *request_buf, ...@@ -593,7 +595,7 @@ int av7110_fw_request(struct av7110 *av7110, u16 *request_buf,
return 0; return 0;
} }
int av7110_fw_query(struct av7110 *av7110, u16 tag, u16* buf, s16 length) static int av7110_fw_query(struct av7110 *av7110, u16 tag, u16* buf, s16 length)
{ {
int ret; int ret;
ret = av7110_fw_request(av7110, &tag, 0, buf, length); ret = av7110_fw_request(av7110, &tag, 0, buf, length);
......
...@@ -364,7 +364,6 @@ enum av7110_command_type { ...@@ -364,7 +364,6 @@ enum av7110_command_type {
extern void av7110_reset_arm(struct av7110 *av7110);
extern int av7110_bootarm(struct av7110 *av7110); extern int av7110_bootarm(struct av7110 *av7110);
extern int av7110_firmversion(struct av7110 *av7110); extern int av7110_firmversion(struct av7110 *av7110);
#define FW_CI_LL_SUPPORT(arm_app) ((arm_app) & 0x80000000) #define FW_CI_LL_SUPPORT(arm_app) ((arm_app) & 0x80000000)
...@@ -373,12 +372,8 @@ extern int av7110_firmversion(struct av7110 *av7110); ...@@ -373,12 +372,8 @@ extern int av7110_firmversion(struct av7110 *av7110);
extern int av7110_wait_msgstate(struct av7110 *av7110, u16 flags); extern int av7110_wait_msgstate(struct av7110 *av7110, u16 flags);
extern int av7110_fw_cmd(struct av7110 *av7110, int type, int com, int num, ...); extern int av7110_fw_cmd(struct av7110 *av7110, int type, int com, int num, ...);
extern int __av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length);
extern int av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length);
extern int av7110_send_ci_cmd(struct av7110 *av7110, u8 subcom, u8 *buf, u8 len);
extern int av7110_fw_request(struct av7110 *av7110, u16 *request_buf, extern int av7110_fw_request(struct av7110 *av7110, u16 *request_buf,
int request_buf_len, u16 *reply_buf, int reply_buf_len); int request_buf_len, u16 *reply_buf, int reply_buf_len);
extern int av7110_fw_query(struct av7110 *av7110, u16 tag, u16* Buff, s16 length);
/* DEBI (saa7146 data extension bus interface) access */ /* DEBI (saa7146 data extension bus interface) access */
......
...@@ -52,7 +52,7 @@ int msp_writereg(struct av7110 *av7110, u8 dev, u16 reg, u16 val) ...@@ -52,7 +52,7 @@ int msp_writereg(struct av7110 *av7110, u8 dev, u16 reg, u16 val)
return 0; return 0;
} }
int msp_readreg(struct av7110 *av7110, u8 dev, u16 reg, u16 *val) static int msp_readreg(struct av7110 *av7110, u8 dev, u16 reg, u16 *val)
{ {
u8 msg1[3] = { dev, reg >> 8, reg & 0xff }; u8 msg1[3] = { dev, reg >> 8, reg & 0xff };
u8 msg2[2]; u8 msg2[2];
......
...@@ -1065,7 +1065,7 @@ static int alps_tdmb7_pll_set(struct dvb_frontend* fe, struct dvb_frontend_param ...@@ -1065,7 +1065,7 @@ static int alps_tdmb7_pll_set(struct dvb_frontend* fe, struct dvb_frontend_param
return 0; return 0;
} }
struct cx22700_config alps_tdmb7_config = { static struct cx22700_config alps_tdmb7_config = {
.demod_address = 0x43, .demod_address = 0x43,
.pll_set = alps_tdmb7_pll_set, .pll_set = alps_tdmb7_pll_set,
}; };
......
...@@ -1565,7 +1565,7 @@ static void ttusb_dec_exit_filters(struct ttusb_dec *dec) ...@@ -1565,7 +1565,7 @@ static void ttusb_dec_exit_filters(struct ttusb_dec *dec)
} }
} }
int fe_send_command(struct dvb_frontend* fe, const u8 command, static int fe_send_command(struct dvb_frontend* fe, const u8 command,
int param_length, const u8 params[], int param_length, const u8 params[],
int *result_length, u8 cmd_result[]) int *result_length, u8 cmd_result[])
{ {
...@@ -1573,7 +1573,7 @@ int fe_send_command(struct dvb_frontend* fe, const u8 command, ...@@ -1573,7 +1573,7 @@ int fe_send_command(struct dvb_frontend* fe, const u8 command,
return ttusb_dec_send_command(dec, command, param_length, params, result_length, cmd_result); return ttusb_dec_send_command(dec, command, param_length, params, result_length, cmd_result);
} }
struct ttusbdecfe_config fe_config = { static struct ttusbdecfe_config fe_config = {
.send_command = fe_send_command .send_command = fe_send_command
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment