Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

V4L/DVB (7861): mt312: Prefix functions only with mt312_, Add zl10313 to kconfig description

This patch does some small cleanup to mt312.
It changes kconfig description to also list the ZL10313.

It does change some strange symbol names to be consistent with
module name mt312 and naming of all other functions in there.
* vp310_mt312_ops -> mt312_ops
* vp310_mt312_attach -> mt312_attach

Adds a MODULE_AUTHOR for me

Signed-off-by: Matthias Schwarzott <zzam@gentoo.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

authored by

Matthias Schwarzott and committed by
Mauro Carvalho Chehab
e4671b6b 6d8425b1

+9 -8
+1 -1
drivers/media/dvb/b2c2/flexcop-fe-tuner.c
··· 634 634 } 635 635 636 636 /* try the sky v2.3 (vp310/Samsung tbdu18132(tsa5059)) */ 637 - fc->fe = dvb_attach(vp310_mt312_attach, 637 + fc->fe = dvb_attach(mt312_attach, 638 638 &skystar23_samsung_tbdu18132_config, i2c); 639 639 if (fc->fe != NULL) { 640 640 ops = &fc->fe->ops;
+1 -1
drivers/media/dvb/frontends/Kconfig
··· 30 30 A DVB-S tuner module. Say Y when you want to support this frontend. 31 31 32 32 config DVB_MT312 33 - tristate "Zarlink VP310/MT312 based" 33 + tristate "Zarlink VP310/MT312/ZL10313 based" 34 34 depends on DVB_CORE && I2C 35 35 default m if DVB_FE_CUSTOMISE 36 36 help
+5 -4
drivers/media/dvb/frontends/mt312.c
··· 737 737 } 738 738 739 739 #define MT312_SYS_CLK 90000000UL /* 90 MHz */ 740 - static struct dvb_frontend_ops vp310_mt312_ops = { 740 + static struct dvb_frontend_ops mt312_ops = { 741 741 742 742 .info = { 743 743 .name = "Zarlink ???? DVB-S", ··· 776 776 .set_voltage = mt312_set_voltage, 777 777 }; 778 778 779 - struct dvb_frontend *vp310_mt312_attach(const struct mt312_config *config, 779 + struct dvb_frontend *mt312_attach(const struct mt312_config *config, 780 780 struct i2c_adapter *i2c) 781 781 { 782 782 struct mt312_state *state = NULL; ··· 795 795 goto error; 796 796 797 797 /* create dvb_frontend */ 798 - memcpy(&state->frontend.ops, &vp310_mt312_ops, 798 + memcpy(&state->frontend.ops, &mt312_ops, 799 799 sizeof(struct dvb_frontend_ops)); 800 800 state->frontend.demodulator_priv = state; 801 801 ··· 827 827 kfree(state); 828 828 return NULL; 829 829 } 830 - EXPORT_SYMBOL(vp310_mt312_attach); 830 + EXPORT_SYMBOL(mt312_attach); 831 831 832 832 module_param(debug, int, 0644); 833 833 MODULE_PARM_DESC(debug, "Turn on/off frontend debugging (default:off)."); 834 834 835 835 MODULE_DESCRIPTION("Zarlink VP310/MT312/ZL10313 DVB-S Demodulator driver"); 836 836 MODULE_AUTHOR("Andreas Oberritter <obi@linuxtv.org>"); 837 + MODULE_AUTHOR("Matthias Schwarzott <zzam@gentoo.org>"); 837 838 MODULE_LICENSE("GPL"); 838 839
+2 -2
drivers/media/dvb/frontends/mt312.h
··· 37 37 }; 38 38 39 39 #if defined(CONFIG_DVB_MT312) || (defined(CONFIG_DVB_MT312_MODULE) && defined(MODULE)) 40 - struct dvb_frontend *vp310_mt312_attach(const struct mt312_config *config, 40 + struct dvb_frontend *mt312_attach(const struct mt312_config *config, 41 41 struct i2c_adapter *i2c); 42 42 #else 43 - static inline struct dvb_frontend *vp310_mt312_attach( 43 + static inline struct dvb_frontend *mt312_attach( 44 44 const struct mt312_config *config, struct i2c_adapter *i2c) 45 45 { 46 46 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);