diff options
Diffstat (limited to 'linux/drivers/media/video/bttv-i2c.c')
| -rw-r--r-- | linux/drivers/media/video/bttv-i2c.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/linux/drivers/media/video/bttv-i2c.c b/linux/drivers/media/video/bttv-i2c.c index 130f2a6de..c02cdb5fa 100644 --- a/linux/drivers/media/video/bttv-i2c.c +++ b/linux/drivers/media/video/bttv-i2c.c @@ -1,5 +1,5 @@ /* - $Id: bttv-i2c.c,v 1.17 2004/12/14 15:33:30 kraxel Exp $ + $Id: bttv-i2c.c,v 1.18 2005/02/16 12:14:10 kraxel Exp $ bttv-i2c.c -- all the i2c code is here @@ -39,7 +39,6 @@ static struct i2c_adapter bttv_i2c_adap_hw_template; static struct i2c_client bttv_i2c_client_template; static int attach_inform(struct i2c_client *client); -static int detach_inform(struct i2c_client *client); static int i2c_debug = 0; static int i2c_hw = 0; @@ -112,7 +111,6 @@ static struct i2c_adapter bttv_i2c_adap_sw_template = { I2C_DEVNAME("bt848"), .id = I2C_HW_B_BT848, .client_register = attach_inform, - .client_unregister = detach_inform, }; /* ----------------------------------------------------------------------- */ @@ -290,7 +288,6 @@ static struct i2c_adapter bttv_i2c_adap_hw_template = { .id = I2C_ALGO_BIT | I2C_HW_B_BT848 /* FIXME */, .algo = &bttv_algo, .client_register = attach_inform, - .client_unregister = detach_inform, }; /* ----------------------------------------------------------------------- */ @@ -305,26 +302,12 @@ static int attach_inform(struct i2c_client *client) if (btv->pinnacle_id != UNSET) bttv_call_i2c_clients(btv,AUDC_CONFIG_PINNACLE, &btv->pinnacle_id); -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) - bttv_i2c_info(&btv->c, client, 1); -#endif - if (bttv_debug) printk("bttv%d: i2c attach [client=%s]\n", btv->c.nr, i2c_clientname(client)); return 0; } -static int detach_inform(struct i2c_client *client) -{ - struct bttv *btv = i2c_get_adapdata(client->adapter); - -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) - bttv_i2c_info(&btv->c, client, 0); -#endif - return 0; -} - void bttv_call_i2c_clients(struct bttv *btv, unsigned int cmd, void *arg) { if (0 != btv->i2c_rc) |