bttv: move fini_bttv_i2c() from bttv-input.c to bttv-i2c.c
Subsystems (2)
PATCH 2/2 bttv: move fini_bttv_i2c() from bttv-input.c to bttv-i2c.c
Like init_bttv_i2c(), fini_bttv_i2c() belongs to bttv-i2c.c.
Signed-off-by Frank Schäfer <[email protected]>
--- drivers/media/pci/bt8xx/bttv-i2c.c | 8 ++++++++ drivers/media/pci/bt8xx/bttv-input.c | 8 -------- drivers/media/pci/bt8xx/bttvp.h | 5 ++++-
3 Dateien geändert, 12 Zeilen hinzugefügt(+), 9 Zeilen entfernt(-)
drivers/media/pci/bt8xx/bttv-i2c.c +8 -0
@@ -394,3 +394,11 @@ int init_bttv_i2c(struct bttv *btv)return btv->i2c_rc; } + +int fini_bttv_i2c (struct bttv *btv) +{ +if (0 != btv->i2c_rc) +return 0 ; + +return i2c_del_adapter (&btv->c.i2c_adap); +}
drivers/media/pci/bt8xx/bttv-input.c +0 -8
@@ -415,14 +415,6 @@ void init_bttv_i2c_ir(struct bttv *btv)#endif } -int fini_bttv_i2c (struct bttv *btv) -{ -if (0 != btv->i2c_rc) -return 0 ; - -return i2c_del_adapter (&btv->c.i2c_adap); -} -int bttv_input_init (struct bttv *btv) {struct bttv_ir *ir;
drivers/media/pci/bt8xx/bttvp.h +4 -1
@@ -300,6 +300,10 @@ extern int no_overlay;/* bttv-input.c */ extern void init_bttv_i2c_ir (struct bttv *btv); + +/* ---------------------------------------------------------- */ +/* bttv-i2c.c */ +extern int init_bttv_i2c (struct bttv *btv);extern int fini_bttv_i2c (struct bttv *btv);/* ---------------------------------------------------------- */
@@ -310,7 +314,6 @@ extern unsigned int bttv_verbose;extern unsigned int bttv_debug;extern unsigned int bttv_gpio;extern void bttv_gpio_tracking (struct bttv *btv,char *comment); -extern int init_bttv_i2c (struct bttv *btv);#define dprintk (fmt, ...) \ do { \
Signature · 1 line
1.7.10.4