Commit 457ba4ce authored by Frank Schaefer's avatar Frank Schaefer Committed by Mauro Carvalho Chehab

[media] 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: default avatarFrank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent fa563073
...@@ -394,3 +394,11 @@ int init_bttv_i2c(struct bttv *btv) ...@@ -394,3 +394,11 @@ int init_bttv_i2c(struct bttv *btv)
return btv->i2c_rc; 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);
}
...@@ -415,14 +415,6 @@ void init_bttv_i2c_ir(struct bttv *btv) ...@@ -415,14 +415,6 @@ void init_bttv_i2c_ir(struct bttv *btv)
#endif #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) int bttv_input_init(struct bttv *btv)
{ {
struct bttv_ir *ir; struct bttv_ir *ir;
......
...@@ -300,6 +300,10 @@ extern int no_overlay; ...@@ -300,6 +300,10 @@ extern int no_overlay;
/* bttv-input.c */ /* bttv-input.c */
extern void init_bttv_i2c_ir(struct bttv *btv); 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); extern int fini_bttv_i2c(struct bttv *btv);
/* ---------------------------------------------------------- */ /* ---------------------------------------------------------- */
...@@ -310,7 +314,6 @@ extern unsigned int bttv_verbose; ...@@ -310,7 +314,6 @@ extern unsigned int bttv_verbose;
extern unsigned int bttv_debug; extern unsigned int bttv_debug;
extern unsigned int bttv_gpio; extern unsigned int bttv_gpio;
extern void bttv_gpio_tracking(struct bttv *btv, char *comment); extern void bttv_gpio_tracking(struct bttv *btv, char *comment);
extern int init_bttv_i2c(struct bttv *btv);
#define dprintk(fmt, ...) \ #define dprintk(fmt, ...) \
do { \ do { \
......
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