- remove dvb i2c code (all drivers are ported to kernel i2c)

- remove dvb i2c frontend (un)register code (all drivers use non-i2c frontend calls now)
- add i2c driver ids for all frontends to dvb_frontend.h (should be submitted to i2c-id.h)
- fix usage of i2c driver ids in dst, ves1x93, nxt6000 drivers
- remove dvb i2c functionality from av7110 and budget drivers
- remove dvb i2c functionality from Skystar2 driver
- fix up kernel Makefile
- add a FE_ATSC case to avoid compiler warning (print warning message instead)

5 files changed, 3 insertions, 13 deletions

diff --git a/linux/drivers/media/dvb/frontends/at76c651.c b/linux/drivers/media/dvb/frontends/at76c651.c
index a986d5ccd..49bcf805c 100644
--- a/linux/drivers/media/dvb/frontends/at76c651.c
+++ b/linux/drivers/media/dvb/frontends/at76c651.c
@@ -41,7 +41,6 @@
 #endif
 
 #include "dvb_frontend.h"
-#include "dvb_i2c.h"
 #include "dvb_functions.h"
 
 #define FRONTEND_NAME "dvbfe_at76c651"
diff --git a/linux/drivers/media/dvb/frontends/dst.c b/linux/drivers/media/dvb/frontends/dst.c
index 4706a9a49..17ea19740 100644
--- a/linux/drivers/media/dvb/frontends/dst.c
+++ b/linux/drivers/media/dvb/frontends/dst.c
@@ -33,9 +33,6 @@
 #include "dvb_functions.h"
 #include "dst-bt878.h"
 
-/* fixme */
-#define I2C_DRIVERID_DST I2C_DRIVERID_EXP1
-
 unsigned int dst_verbose = 0;
 MODULE_PARM(dst_verbose, "i");
 MODULE_PARM_DESC(dst_verbose, "verbose startup messages, default is 1 (yes)");
@@ -1228,7 +1225,7 @@ static int command(struct i2c_client *client, unsigned int cmd, void *arg)
 static struct i2c_driver driver = {
 	.owner = THIS_MODULE,
 	.name = "dst",
-	.id = I2C_DRIVERID_DST,
+	.id = I2C_DRIVERID_DVBFE_DST,
 	.flags = I2C_DF_NOTIFY,
 	.attach_adapter = attach_adapter,
 	.detach_client = detach_client,
diff --git a/linux/drivers/media/dvb/frontends/nxt6000.c b/linux/drivers/media/dvb/frontends/nxt6000.c
index 578451749..cb0346ce4 100644
--- a/linux/drivers/media/dvb/frontends/nxt6000.c
+++ b/linux/drivers/media/dvb/frontends/nxt6000.c
@@ -34,9 +34,6 @@
 #include "dvb_frontend.h"
 #include "nxt6000.h"
 
-/* fixme: add this to i2c-id.h */
-#define I2C_DRIVERID_NXT6000 I2C_DRIVERID_EXP1
-
 MODULE_DESCRIPTION("NxtWave NXT6000 DVB demodulator driver");
 MODULE_AUTHOR("Florian Schirmer");
 MODULE_LICENSE("GPL");
@@ -824,7 +821,7 @@ static int command(struct i2c_client *client, unsigned int cmd, void *arg)
 static struct i2c_driver driver = {
 	.owner = THIS_MODULE,
 	.name = "nxt6000",
-	.id = I2C_DRIVERID_NXT6000,
+	.id = I2C_DRIVERID_DVBFE_NXT6000,
 	.flags = I2C_DF_NOTIFY,
 	.attach_adapter = attach_adapter,
 	.detach_client = detach_client,
diff --git a/linux/drivers/media/dvb/frontends/ves1820.c b/linux/drivers/media/dvb/frontends/ves1820.c
index c8c2fdd9b..23fff9d2d 100644
--- a/linux/drivers/media/dvb/frontends/ves1820.c
+++ b/linux/drivers/media/dvb/frontends/ves1820.c
@@ -30,7 +30,6 @@
 
 #include "dvb_frontend.h"
 #include "dvb_functions.h"
-#include "dvb_i2c.h"
 
 /* I2C_DRIVERID_VES1820 is already defined in i2c-id.h */
 
diff --git a/linux/drivers/media/dvb/frontends/ves1x93.c b/linux/drivers/media/dvb/frontends/ves1x93.c
index 992ca9e45..27e9e0401 100644
--- a/linux/drivers/media/dvb/frontends/ves1x93.c
+++ b/linux/drivers/media/dvb/frontends/ves1x93.c
@@ -32,8 +32,6 @@
 #include "dvb_frontend.h"
 #include "dvb_functions.h"
 
-/* fixme: add this to i2c-id.h */
-#define I2C_DRIVERID_VES1X93 I2C_DRIVERID_EXP1  
 static int debug = 0;
 #define dprintk	if (debug) printk
 
@@ -685,7 +683,7 @@ static int command (struct i2c_client *client, unsigned int cmd, void *arg)
 static struct i2c_driver driver = {
 	.owner 		= THIS_MODULE,
 	.name 		= "ves1x93",
-	.id 		= I2C_DRIVERID_VES1X93,
+	.id 		= I2C_DRIVERID_DVBFE_VES1X93,
 	.flags 		= I2C_DF_NOTIFY,
 	.attach_adapter = attach_adapter,
 	.detach_client 	= detach_client,