Skip to contentSkip to conversation

drivers/media/dvb/: possible cleanups

PATCH In review Adrian Bunk 2 participants 2 messages Apr 19, 2005 – Apr 20, 2005 Media (V4L/DVB)

lore
Share & tools
lore

Adrian Bunk

author
#0 lore raw

PATCH 1/1 drivers/media/dvb/: possible cleanups

This patch contains the following possible cleanups:
- make needlessly global code static
- #if 0 the following unused global functions:
- dibusb/dvb-dibusb-usb.c: dibusb_set_streaming_mode
- frontends/mt352.c: mt352_read
- ttpci/av7110_hw.c: av7110_reset_arm
- ttpci/av7110_hw.c: av7110_send_ci_cmd
- remove the following unneeded EXPORT_SYMBOL:
- frontends/mt352.c: mt352_read

Please review which of these changes do make sense.

Signed-off-by Adrian Bunk <[email protected]>

---

 drivers/media/dvb/dibusb/dvb-dibusb-usb.c         |    2 ++
 drivers/media/dvb/dibusb/dvb-dibusb.h             |    1 -
 drivers/media/dvb/frontends/mt352.c               |    3 ++-
 drivers/media/dvb/frontends/mt352.h               |    1 -
 drivers/media/dvb/ttpci/av7110.h                  |    1 -
 drivers/media/dvb/ttpci/av7110_hw.c               |   12 +++++++-----
 drivers/media/dvb/ttpci/av7110_hw.h               |    5 -----
 drivers/media/dvb/ttpci/av7110_v4l.c              |    2 +-
 drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c |    2 +-
 drivers/media/dvb/ttusb-dec/ttusb_dec.c           |    8 ++++----
 10 files changed, 17 insertions(+), 20 deletions(-)
drivers/media/dvb/dibusb/dvb-dibusb.h renamed from drivers/media/dvb/dibusb/dvb-dibusb.h.old +0 -1
@@ -230,7 +230,6 @@
 
 int dibusb_hw_wakeup(struct dvb_frontend *);
 int dibusb_hw_sleep(struct dvb_frontend *);
-int dibusb_set_streaming_mode(struct usb_dibusb *,u8);
 int dibusb_streaming(struct usb_dibusb *,int);
 
 int dibusb_urb_init(struct usb_dibusb *);
drivers/media/dvb/dibusb/dvb-dibusb-usb.c renamed from drivers/media/dvb/dibusb/dvb-dibusb-usb.c.old +2 -0
@@ -139,11 +139,13 @@
 	return 0;
 }
 
+#if 0
 int dibusb_set_streaming_mode(struct usb_dibusb *dib,u8 mode)
 {
 	u8 b[2] = { DIBUSB_REQ_SET_STREAMING_MODE, mode };
 	return dibusb_readwrite_usb(dib,b,2,NULL,0);
 }
+#endif  /*  0  */
 
 static int dibusb_urb_kill(struct usb_dibusb *dib)
 {
drivers/media/dvb/frontends/mt352.h renamed from drivers/media/dvb/frontends/mt352.h.old +0 -1
@@ -61,7 +61,6 @@
 					 struct i2c_adapter* i2c);
 
 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
drivers/media/dvb/frontends/mt352.c renamed from drivers/media/dvb/frontends/mt352.c.old +2 -1
@@ -102,10 +102,12 @@
 	return b1[0];
 }
 
+#if 0
 int mt352_read(struct dvb_frontend *fe, u8 reg)
 {
 	return mt352_read_register(fe->demodulator_priv,reg);
 }
+#endif  /*  0  */
 
 static int mt352_sleep(struct dvb_frontend* fe)
 {

@@ -601,7 +603,6 @@
 
 EXPORT_SYMBOL(mt352_attach);
 EXPORT_SYMBOL(mt352_write);
-EXPORT_SYMBOL(mt352_read);
 /*
  * Local variables:
  * c-basic-offset: 8
drivers/media/dvb/ttpci/av7110_hw.h renamed from drivers/media/dvb/ttpci/av7110_hw.h.old +0 -5
@@ -364,7 +364,6 @@
 
 
 
-extern void av7110_reset_arm(struct av7110 *av7110);
 extern int av7110_bootarm(struct av7110 *av7110);
 extern int av7110_firmversion(struct av7110 *av7110);
 #define FW_CI_LL_SUPPORT(arm_app) ((arm_app) & 0x80000000)

@@ -373,12 +372,8 @@
 
 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_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,
 			     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 */
drivers/media/dvb/ttpci/av7110_hw.c renamed from drivers/media/dvb/ttpci/av7110_hw.c.old +7 -5
@@ -104,7 +104,7 @@
 
 
 /* av7110 ARM core boot stuff */
-
+#if 0
 void av7110_reset_arm(struct av7110 *av7110)
 {
 	saa7146_setgpio(av7110->dev, RESET_LINE, SAA7146_GPIO_OUTLO);

@@ -124,7 +124,7 @@
 	av7110->arm_ready = 1;
 	dprintk(1, "reset ARM\n");
 }
-
+#endif  /*  0  */
 
 static int waitdebi(struct av7110 *av7110, int adr, int state)
 {

@@ -335,7 +335,7 @@
 	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;
 	unsigned long start;

@@ -455,7 +455,7 @@
 	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;
 

@@ -500,6 +500,7 @@
 	return ret;
 }
 
+#if 0
 int av7110_send_ci_cmd(struct av7110 *av7110, u8 subcom, u8 *buf, u8 len)
 {
 	int i, ret;

@@ -521,6 +522,7 @@
 		printk(KERN_ERR "dvb-ttpci: av7110_send_ci_cmd error %d\n", ret);
 	return ret;
 }
+#endif  /*  0  */
 
 int av7110_fw_request(struct av7110 *av7110, u16 *request_buf,
 		      int request_buf_len, u16 *reply_buf, int reply_buf_len)

@@ -593,7 +595,7 @@
 	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;
 	ret = av7110_fw_request(av7110, &tag, 0, buf, length);
drivers/media/dvb/ttpci/av7110.h renamed from drivers/media/dvb/ttpci/av7110.h.old +0 -1
@@ -274,7 +274,6 @@
 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 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);
drivers/media/dvb/ttpci/av7110_v4l.c renamed from drivers/media/dvb/ttpci/av7110_v4l.c.old +1 -1
@@ -52,7 +52,7 @@
 	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 msg2[2];
drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c renamed from drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c.old +1 -1
@@ -1065,7 +1065,7 @@
 	return 0;
 }
 
-struct cx22700_config alps_tdmb7_config = {
+static struct cx22700_config alps_tdmb7_config = {
 	.demod_address = 0x43,
 	.pll_set = alps_tdmb7_pll_set,
 };
drivers/media/dvb/ttusb-dec/ttusb_dec.c renamed from drivers/media/dvb/ttusb-dec/ttusb_dec.c.old +4 -4
@@ -1565,15 +1565,15 @@
 	}
 }
 
-int fe_send_command(struct dvb_frontend* fe, const u8 command,
-		    int param_length, const u8 params[],
-		    int *result_length, u8 cmd_result[])
+static int fe_send_command(struct dvb_frontend* fe, const u8 command,
+			   int param_length, const u8 params[],
+			   int *result_length, u8 cmd_result[])
 {
 	struct ttusb_dec* dec = (struct ttusb_dec*) fe->dvb->priv;
 	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
 };
#1 lore raw
Quoted 11 lines · Adrian Bunk

This patch contains the following possible cleanups:
- make needlessly global code static
- #if 0 the following unused global functions:
- dibusb/dvb-dibusb-usb.c: dibusb_set_streaming_mode
- frontends/mt352.c: mt352_read
- ttpci/av7110_hw.c: av7110_reset_arm
- ttpci/av7110_hw.c: av7110_send_ci_cmd
- remove the following unneeded EXPORT_SYMBOL:
- frontends/mt352.c: mt352_read

Please review which of these changes do make sense.

I'll apply this patch to linuxtv.org CVS.

Most cleanups look fine, except the dibusb driver has been superseded by a generalized dvb-usb driver. mt352_read() can be dropped completely.

Thanks,
Johannes