Skip to contentSkip to conversation

drivers/media/dvb/frontends/mt312.c: possible cleanups

PATCH New Adrian Bunk 1 participant 1 message Jan 28, 2006 Media (V4L/DVB)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drivers/media/dvb/frontends/mt312.c: possible cleanups

This patch contains the following possible cleanups:
- update the Kconfig help to mention the VP310
- merge vp310_attach and mt312_attach into a new vp310_mt312_attach to remove some code duplication

---

 drivers/media/dvb/b2c2/flexcop-fe-tuner.c |    2 
 drivers/media/dvb/frontends/Kconfig       |    2 
 drivers/media/dvb/frontends/mt312.c       |  111 +++++++---------------
 drivers/media/dvb/frontends/mt312.h       |    6 -
 4 files changed, 43 insertions(+), 78 deletions(-)
drivers/media/dvb/frontends/Kconfig renamed from drivers/media/dvb/frontends/Kconfig.old +1 -1
@@ -29,7 +29,7 @@
 	  A DVB-S tuner module. Say Y when you want to support this frontend.
 
 config DVB_MT312
-	tristate "Zarlink MT312 based"
+	tristate "Zarlink VP310/MT312 based"
 	depends on DVB_CORE
 	help
 	  A DVB-S tuner module. Say Y when you want to support this frontend.
drivers/media/dvb/frontends/mt312.h renamed from drivers/media/dvb/frontends/mt312.h.old +2 -4
@@ -38,10 +38,8 @@
 	int (*pll_set)(struct dvb_frontend* fe, struct dvb_frontend_parameters* params);
 };
 
-extern struct dvb_frontend* mt312_attach(const struct mt312_config* config,
-					 struct i2c_adapter* i2c);
+struct dvb_frontend* vp310_mt312_attach(const struct mt312_config* config,
+					struct i2c_adapter* i2c);
 
-extern struct dvb_frontend* vp310_attach(const struct mt312_config* config,
-					 struct i2c_adapter* i2c);
 
 #endif // MT312_H
drivers/media/dvb/frontends/mt312.c renamed from drivers/media/dvb/frontends/mt312.c.old +39 -72

126 lines not on this page · raw message

drivers/media/dvb/b2c2/flexcop-fe-tuner.c renamed from drivers/media/dvb/b2c2/flexcop-fe-tuner.c.old +1 -1
@@ -526,7 +526,7 @@
 		info("found the stv0297 at i2c address: 0x%02x",alps_tdee4_stv0297_config.demod_address);
 	} else
 	/* try the sky v2.3 (vp310/Samsung tbdu18132(tsa5059)) */
-	if ((fc->fe = vp310_attach(&skystar23_samsung_tbdu18132_config, &fc->i2c_adap)) != NULL) {
+	if ((fc->fe = vp310_mt312_attach(&skystar23_samsung_tbdu18132_config, &fc->i2c_adap)) != NULL) {
 		ops = fc->fe->ops;
 
 		ops->diseqc_send_master_cmd = flexcop_diseqc_send_master_cmd;