diff options
-rw-r--r-- | drivers/media/video/em28xx/em28xx-i2c.c | 16 | ||||
-rw-r--r-- | drivers/media/video/tvmixer.c | 8 |
2 files changed, 0 insertions, 24 deletions
diff --git a/drivers/media/video/em28xx/em28xx-i2c.c b/drivers/media/video/em28xx/em28xx-i2c.c index 80d8c2dde6fb..fce30d341887 100644 --- a/drivers/media/video/em28xx/em28xx-i2c.c +++ b/drivers/media/video/em28xx/em28xx-i2c.c | |||
@@ -399,17 +399,6 @@ static u32 functionality(struct i2c_adapter *adap) | |||
399 | return I2C_FUNC_SMBUS_EMUL; | 399 | return I2C_FUNC_SMBUS_EMUL; |
400 | } | 400 | } |
401 | 401 | ||
402 | #ifndef I2C_PEC | ||
403 | static void inc_use(struct i2c_adapter *adap) | ||
404 | { | ||
405 | MOD_INC_USE_COUNT; | ||
406 | } | ||
407 | |||
408 | static void dec_use(struct i2c_adapter *adap) | ||
409 | { | ||
410 | MOD_DEC_USE_COUNT; | ||
411 | } | ||
412 | #endif | ||
413 | 402 | ||
414 | static int em28xx_set_tuner(int check_eeprom, struct i2c_client *client) | 403 | static int em28xx_set_tuner(int check_eeprom, struct i2c_client *client) |
415 | { | 404 | { |
@@ -480,12 +469,7 @@ static struct i2c_algorithm em28xx_algo = { | |||
480 | }; | 469 | }; |
481 | 470 | ||
482 | static struct i2c_adapter em28xx_adap_template = { | 471 | static struct i2c_adapter em28xx_adap_template = { |
483 | #ifdef I2C_PEC | ||
484 | .owner = THIS_MODULE, | 472 | .owner = THIS_MODULE, |
485 | #else | ||
486 | .inc_use = inc_use, | ||
487 | .dec_use = dec_use, | ||
488 | #endif | ||
489 | .class = I2C_CLASS_TV_ANALOG, | 473 | .class = I2C_CLASS_TV_ANALOG, |
490 | .name = "em28xx", | 474 | .name = "em28xx", |
491 | .id = I2C_HW_B_EM28XX, | 475 | .id = I2C_HW_B_EM28XX, |
diff --git a/drivers/media/video/tvmixer.c b/drivers/media/video/tvmixer.c index 9e86caeb96a7..1654576de10e 100644 --- a/drivers/media/video/tvmixer.c +++ b/drivers/media/video/tvmixer.c | |||
@@ -198,10 +198,6 @@ static int tvmixer_open(struct inode *inode, struct file *file) | |||
198 | 198 | ||
199 | /* lock bttv in memory while the mixer is in use */ | 199 | /* lock bttv in memory while the mixer is in use */ |
200 | file->private_data = mix; | 200 | file->private_data = mix; |
201 | #ifndef I2C_PEC | ||
202 | if (client->adapter->inc_use) | ||
203 | client->adapter->inc_use(client->adapter); | ||
204 | #endif | ||
205 | if (client->adapter->owner) | 201 | if (client->adapter->owner) |
206 | try_module_get(client->adapter->owner); | 202 | try_module_get(client->adapter->owner); |
207 | return 0; | 203 | return 0; |
@@ -217,10 +213,6 @@ static int tvmixer_release(struct inode *inode, struct file *file) | |||
217 | return -ENODEV; | 213 | return -ENODEV; |
218 | } | 214 | } |
219 | 215 | ||
220 | #ifndef I2C_PEC | ||
221 | if (client->adapter->dec_use) | ||
222 | client->adapter->dec_use(client->adapter); | ||
223 | #endif | ||
224 | if (client->adapter->owner) | 216 | if (client->adapter->owner) |
225 | module_put(client->adapter->owner); | 217 | module_put(client->adapter->owner); |
226 | return 0; | 218 | return 0; |