[2.6 patch] drivers/media/video/: remove dead #ifndef I2C_PEC code

[Adrian Bunk]

This patch removes dead #ifndef I2C_PEC code.

Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>

---

 drivers/media/video/em28xx/em28xx-i2c.c |   17 -----------------
 drivers/media/video/tvmixer.c           |    8 --------
 2 files changed, 25 deletions(-)

--- linux-2.6.17-rc1-mm2-full/drivers/media/video/em28xx/em28xx-i2c.c.old	2006-04-15 21:38:11.000000000 +0200
+++ linux-2.6.17-rc1-mm2-full/drivers/media/video/em28xx/em28xx-i2c.c	2006-04-15 21:38:29.000000000 +0200
@@ -399,18 +399,6 @@ static u32 functionality(struct i2c_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
-
 static int em28xx_set_tuner(int check_eeprom, struct i2c_client *client)
 {
 	struct em28xx *dev = client->adapter->algo_data;
@@ -480,12 +468,7 @@ 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
 	.class = I2C_CLASS_TV_ANALOG,
 	.name = "em28xx",
 	.id = I2C_HW_B_EM28XX,
--- linux-2.6.17-rc1-mm2-full/drivers/media/video/tvmixer.c.old	2006-04-15 21:38:37.000000000 +0200
+++ linux-2.6.17-rc1-mm2-full/drivers/media/video/tvmixer.c	2006-04-15 21:38:48.000000000 +0200
@@ -198,10 +198,6 @@ static int tvmixer_open(struct inode *in
 
 	/* lock bttv in memory while the mixer is in use  */
 	file->private_data = mix;
-#ifndef I2C_PEC
-	if (client->adapter->inc_use)
-		client->adapter->inc_use(client->adapter);
-#endif
 	if (client->adapter->owner)
 		try_module_get(client->adapter->owner);
 	return 0;
@@ -217,10 +213,6 @@ static int tvmixer_release(struct inode 
 		return -ENODEV;
 	}
 
-#ifndef I2C_PEC
-	if (client->adapter->dec_use)
-		client->adapter->dec_use(client->adapter);
-#endif
 	if (client->adapter->owner)
 		module_put(client->adapter->owner);
 	return 0;

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/