summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/em28xx/em28xx-i2c.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-07-08 07:25:08 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-08 07:25:08 -0300
commitc13f70467621e2c352f93b336b382e70ea24d218 (patch)
tree582367340fe7529eb3fec3c514ec9d4b2f68ff71 /linux/drivers/media/video/em28xx/em28xx-i2c.c
parenta953cf4edb8db13f8b7d20c793696a13ffcd3333 (diff)
parent9380e197397e3f8404fa2d2effe5c84b6f56735b (diff)
downloadmediapointer-dvb-s2-c13f70467621e2c352f93b336b382e70ea24d218.tar.gz
mediapointer-dvb-s2-c13f70467621e2c352f93b336b382e70ea24d218.tar.bz2
merge: http://linuxtv.org/hg/~jfrancois/gspca/
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/em28xx/em28xx-i2c.c')
-rw-r--r--linux/drivers/media/video/em28xx/em28xx-i2c.c19
1 files changed, 0 insertions, 19 deletions
diff --git a/linux/drivers/media/video/em28xx/em28xx-i2c.c b/linux/drivers/media/video/em28xx/em28xx-i2c.c
index c22e73019..4d6f650da 100644
--- a/linux/drivers/media/video/em28xx/em28xx-i2c.c
+++ b/linux/drivers/media/video/em28xx/em28xx-i2c.c
@@ -432,18 +432,6 @@ static u32 functionality(struct i2c_adapter *adap)
return I2C_FUNC_SMBUS_EMUL;
}
-#ifndef I2C_PEC
-static void inc_use(struct i2c_adapter *adap)
-{
- MOD_INC_USE_COUNT;
-}
-
-static void dec_use(struct i2c_adapter *adap)
-{
- MOD_DEC_USE_COUNT;
-}
-#endif
-
/*
* attach_inform()
* gets called when a device attaches to the i2c bus
@@ -521,15 +509,8 @@ static struct i2c_algorithm em28xx_algo = {
};
static struct i2c_adapter em28xx_adap_template = {
-#ifdef I2C_PEC
.owner = THIS_MODULE,
-#else
- .inc_use = inc_use,
- .dec_use = dec_use,
-#endif
-#ifdef I2C_CLASS_TV_ANALOG
.class = I2C_CLASS_TV_ANALOG,
-#endif
.name = "em28xx",
.id = I2C_HW_B_EM28XX,
.algo = &em28xx_algo,