31 files changed, 82 insertions, 99 deletions
diff --git a/drivers/media/video/adv7170.c b/drivers/media/video/adv7170.c
index 48989eda2400..52e32f05d625 100644
--- a/drivers/media/video/adv7170.c
+++ b/drivers/media/video/adv7170.c
@@ -391,7 +391,6 @@ static struct i2c_client_address_data addr_data = {
        .normal_i2c             = normal_i2c,
        .probe                  = &ignore,
        .ignore                 = &ignore,
-        .force                  = &ignore,
 };
 static struct i2c_driver i2c_driver_adv7170;
diff --git a/drivers/media/video/adv7175.c b/drivers/media/video/adv7175.c
index f898b6586374..b5ed9544bdea 100644
--- a/drivers/media/video/adv7175.c
+++ b/drivers/media/video/adv7175.c
@@ -441,7 +441,6 @@ static struct i2c_client_address_data addr_data = {
        .normal_i2c             = normal_i2c,
        .probe                  = &ignore,
        .ignore                 = &ignore,
-        .force                  = &ignore,
 };
 static struct i2c_driver i2c_driver_adv7175;
diff --git a/drivers/media/video/bt819.c b/drivers/media/video/bt819.c
index 8733588f6db3..c6cfa7c48b04 100644
--- a/drivers/media/video/bt819.c
+++ b/drivers/media/video/bt819.c
@@ -507,7 +507,6 @@ static struct i2c_client_address_data addr_data = {
        .normal_i2c             = normal_i2c,
        .probe                  = &ignore,
        .ignore                 = &ignore,
-        .force                  = &ignore,
 };
 static struct i2c_driver i2c_driver_bt819;
diff --git a/drivers/media/video/bt832.c b/drivers/media/video/bt832.c
index a070417e65e6..76c1b63ebdf2 100644
--- a/drivers/media/video/bt832.c
+++ b/drivers/media/video/bt832.c
@@ -188,7 +188,7 @@ static int bt832_probe(struct i2c_adapter *adap)
        if (adap->class & I2C_CLASS_TV_ANALOG)
                return i2c_probe(adap, &addr_data, bt832_attach);
 #else
-        if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848))
+        if (adap->id == I2C_HW_B_BT848)
                return i2c_probe(adap, &addr_data, bt832_attach);
 #endif
        return 0;
@@ -241,7 +241,7 @@ static struct i2c_driver driver = {
 };
 static struct i2c_client client_template =
 {
-        I2C_DEVNAME("bt832"),
+        .name       = "bt832",
        .flags      = I2C_CLIENT_ALLOW_USE,
        .driver     = &driver,
 };
diff --git a/drivers/media/video/bt856.c b/drivers/media/video/bt856.c
index a5d529ccf3ad..c13d28658868 100644
--- a/drivers/media/video/bt856.c
+++ b/drivers/media/video/bt856.c
@@ -295,7 +295,6 @@ static struct i2c_client_address_data addr_data = {
        .normal_i2c             = normal_i2c,
        .probe                  = &ignore,
        .ignore                 = &ignore,
-        .force                  = &ignore,
 };
 static struct i2c_driver i2c_driver_bt856;
diff --git a/drivers/media/video/bttv-i2c.c b/drivers/media/video/bttv-i2c.c
index 234a85563769..706dc48df962 100644
--- a/drivers/media/video/bttv-i2c.c
+++ b/drivers/media/video/bttv-i2c.c
@@ -109,7 +109,7 @@ static struct i2c_adapter bttv_i2c_adap_sw_template = {
 #ifdef I2C_CLASS_TV_ANALOG
        .class             = I2C_CLASS_TV_ANALOG,
 #endif
-        I2C_DEVNAME("bt848"),
+        .name              = "bt848",
        .id                = I2C_HW_B_BT848,
        .client_register   = attach_inform,
 };
@@ -270,8 +270,6 @@ static int bttv_i2c_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs, int
 }
 static struct i2c_algorithm bttv_algo = {
-        .name          = "bt878",
-        .id            = I2C_ALGO_BIT | I2C_HW_B_BT848 /* FIXME */,
        .master_xfer   = bttv_i2c_xfer,
        .algo_control  = algo_control,
        .functionality = functionality,
@@ -282,8 +280,8 @@ static struct i2c_adapter bttv_i2c_adap_hw_template = {
 #ifdef I2C_CLASS_TV_ANALOG
        .class         = I2C_CLASS_TV_ANALOG,
 #endif
-        I2C_DEVNAME("bt878"),
+        .name          = "bt878",
-        .id            = I2C_ALGO_BIT | I2C_HW_B_BT848 /* FIXME */,
+        .id            = I2C_HW_B_BT848 /* FIXME */,
        .algo          = &bttv_algo,
        .client_register = attach_inform,
 };
@@ -298,7 +296,7 @@ static int attach_inform(struct i2c_client *client)
        if (bttv_debug)
                printk(KERN_DEBUG "bttv%d: %s i2c attach [addr=0x%x,client=%s]\n",
                        btv->c.nr,client->driver->name,client->addr,
-                        i2c_clientname(client));
+                        client->name);
        if (!client->driver->command)
                return 0;
@@ -326,7 +324,7 @@ void bttv_call_i2c_clients(struct bttv *btv, unsigned int cmd, void *arg)
 }
 static struct i2c_client bttv_i2c_client_template = {
-        I2C_DEVNAME("bttv internal"),
+        .name   = "bttv internal",
 };
diff --git a/drivers/media/video/cx88/cx88-i2c.c b/drivers/media/video/cx88/cx88-i2c.c
index a628a55299c6..7f598039e025 100644
--- a/drivers/media/video/cx88/cx88-i2c.c
+++ b/drivers/media/video/cx88/cx88-i2c.c
@@ -95,7 +95,7 @@ static int attach_inform(struct i2c_client *client)
        struct cx88_core *core = i2c_get_adapdata(client->adapter);
        dprintk(1, "%s i2c attach [addr=0x%x,client=%s]\n",
-                client->driver->name,client->addr,i2c_clientname(client));
+                client->driver->name, client->addr, client->name);
        if (!client->driver->command)
                return 0;
@@ -128,7 +128,7 @@ static int detach_inform(struct i2c_client *client)
 {
        struct cx88_core *core = i2c_get_adapdata(client->adapter);
-        dprintk(1, "i2c detach [client=%s]\n", i2c_clientname(client));
+        dprintk(1, "i2c detach [client=%s]\n", client->name);
        return 0;
 }
@@ -152,7 +152,7 @@ static struct i2c_algo_bit_data cx8800_i2c_algo_template = {
 /* ----------------------------------------------------------------------- */
 static struct i2c_adapter cx8800_i2c_adap_template = {
-        I2C_DEVNAME("cx2388x"),
+        .name              = "cx2388x",
        .owner             = THIS_MODULE,
        .id                = I2C_HW_B_CX2388x,
        .client_register   = attach_inform,
@@ -160,7 +160,7 @@ static struct i2c_adapter cx8800_i2c_adap_template = {
 };
 static struct i2c_client cx8800_i2c_client_template = {
-        I2C_DEVNAME("cx88xx internal"),
+        .name   = "cx88xx internal",
 };
 static char *i2c_devs[128] = {
diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index 9fc5055e001c..1e273ff3f956 100644
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -308,7 +308,7 @@ static struct i2c_driver driver = {
 static struct i2c_client client_template =
 {
-        I2C_DEVNAME("unset"),
+        .name = "unset",
        .driver = &driver
 };
@@ -429,10 +429,10 @@ static int ir_probe(struct i2c_adapter *adap)
        struct i2c_client c; char buf; int i,rc;
        switch (adap->id) {
-        case I2C_ALGO_BIT | I2C_HW_B_BT848:
+        case I2C_HW_B_BT848:
                probe = probe_bttv;
                break;
-        case I2C_ALGO_SAA7134:
+        case I2C_HW_SAA7134:
                probe = probe_saa7134;
                break;
        }
diff --git a/drivers/media/video/msp3400.c b/drivers/media/video/msp3400.c
index e956234abf24..ca02f6f14b00 100644
--- a/drivers/media/video/msp3400.c
+++ b/drivers/media/video/msp3400.c
@@ -1437,7 +1437,7 @@ static struct i2c_driver driver = {
 static struct i2c_client client_template =
 {
-        I2C_DEVNAME("(unset)"),
+        .name      = "(unset)",
        .flags     = I2C_CLIENT_ALLOW_USE,
        .driver    = &driver,
 };
@@ -1509,7 +1509,7 @@ static int msp_attach(struct i2c_adapter *adap, int addr, int kind)
        }
        /* hello world :-) */
-        printk(KERN_INFO "msp34xx: init: chip=%s",i2c_clientname(c));
+        printk(KERN_INFO "msp34xx: init: chip=%s", c->name);
        if (HAVE_NICAM(msp))
                printk(" +nicam");
        if (HAVE_SIMPLE(msp))
diff --git a/drivers/media/video/ovcamchip/ov6x20.c b/drivers/media/video/ovcamchip/ov6x20.c
index 3433619ad93f..b3f4d266cede 100644
--- a/drivers/media/video/ovcamchip/ov6x20.c
+++ b/drivers/media/video/ovcamchip/ov6x20.c
@@ -164,10 +164,10 @@ static int ov6x20_init(struct i2c_client *c)
        DDEBUG(4, &c->dev, "entered");
        switch (c->adapter->id) {
-        case I2C_ALGO_SMBUS | I2C_HW_SMBUS_OV511:
+        case I2C_HW_SMBUS_OV511:
                rc = ov_write_regvals(c, regvals_init_6x20_511);
                break;
-        case I2C_ALGO_SMBUS | I2C_HW_SMBUS_OV518:
+        case I2C_HW_SMBUS_OV518:
                rc = ov_write_regvals(c, regvals_init_6x20_518);
                break;
        default:
@@ -338,7 +338,7 @@ static int ov6x20_mode_init(struct i2c_client *c, struct ovcamchip_window *win)
        /******** Palette-specific regs ********/
        /* OV518 needs 8 bit multiplexed in color mode, and 16 bit in B&W */
-        if (c->adapter->id == (I2C_ALGO_SMBUS | I2C_HW_SMBUS_OV518)) {
+        if (c->adapter->id == I2C_HW_SMBUS_OV518) {
                if (win->format == VIDEO_PALETTE_GREY)
                        ov_write_mask(c, 0x13, 0x00, 0x20);
                else
diff --git a/drivers/media/video/ovcamchip/ov6x30.c b/drivers/media/video/ovcamchip/ov6x30.c
index 44a842379b45..6eab458ab792 100644
--- a/drivers/media/video/ovcamchip/ov6x30.c
+++ b/drivers/media/video/ovcamchip/ov6x30.c
@@ -301,7 +301,7 @@ static int ov6x30_mode_init(struct i2c_client *c, struct ovcamchip_window *win)
        /******** Palette-specific regs ********/
        if (win->format == VIDEO_PALETTE_GREY) {
-                if (c->adapter->id == (I2C_ALGO_SMBUS | I2C_HW_SMBUS_OV518)) {
+                if (c->adapter->id == I2C_HW_SMBUS_OV518) {
                        /* Do nothing - we're already in 8-bit mode */
                } else {
                        ov_write_mask(c, 0x13, 0x20, 0x20);
@@ -313,7 +313,7 @@ static int ov6x30_mode_init(struct i2c_client *c, struct ovcamchip_window *win)
                 * Therefore, the OV6630 needs to be in 8-bit multiplexed
                 * output mode */
-                if (c->adapter->id == (I2C_ALGO_SMBUS | I2C_HW_SMBUS_OV518)) {
+                if (c->adapter->id == I2C_HW_SMBUS_OV518) {
                        /* Do nothing - we want to stay in 8-bit mode */
                        /* Warning: Messing with reg 0x13 breaks OV518 color */
                } else {
diff --git a/drivers/media/video/ovcamchip/ovcamchip_core.c b/drivers/media/video/ovcamchip/ovcamchip_core.c
index 54dd5612d3b8..2de34ebf0673 100644
--- a/drivers/media/video/ovcamchip/ovcamchip_core.c
+++ b/drivers/media/video/ovcamchip/ovcamchip_core.c
@@ -296,10 +296,10 @@ static int ovcamchip_attach(struct i2c_adapter *adap)
         * attach to adapters that are known to contain OV camera chips. */
        switch (adap->id) {
-        case (I2C_ALGO_SMBUS | I2C_HW_SMBUS_OV511):
+        case I2C_HW_SMBUS_OV511:
-        case (I2C_ALGO_SMBUS | I2C_HW_SMBUS_OV518):
+        case I2C_HW_SMBUS_OV518:
-        case (I2C_ALGO_SMBUS | I2C_HW_SMBUS_OVFX2):
+        case I2C_HW_SMBUS_OVFX2:
-        case (I2C_ALGO_SMBUS | I2C_HW_SMBUS_W9968CF):
+        case I2C_HW_SMBUS_W9968CF:
                PDEBUG(1, "Adapter ID 0x%06x accepted", adap->id);
                break;
        default:
@@ -314,7 +314,7 @@ static int ovcamchip_attach(struct i2c_adapter *adap)
        }
        memcpy(c, &client_template, sizeof *c);
        c->adapter = adap;
-        strcpy(i2c_clientname(c), "OV????");
+        strcpy(c->name, "OV????");
        ov = kmalloc(sizeof *ov, GFP_KERNEL);
        if (!ov) {
@@ -328,7 +328,7 @@ static int ovcamchip_attach(struct i2c_adapter *adap)
        if (rc < 0)
                goto error;
-        strcpy(i2c_clientname(c), chip_names[ov->subtype]);
+        strcpy(c->name, chip_names[ov->subtype]);
        PDEBUG(1, "Camera chip detection complete");
@@ -421,7 +421,7 @@ static struct i2c_driver driver = {
 };
 static struct i2c_client client_template = {
-        I2C_DEVNAME("(unset)"),
+        .name =         "(unset)",
        .driver =       &driver,
 };
diff --git a/drivers/media/video/saa7110.c b/drivers/media/video/saa7110.c
index 22d055d8a695..e116bdbed310 100644
--- a/drivers/media/video/saa7110.c
+++ b/drivers/media/video/saa7110.c
@@ -470,7 +470,6 @@ static struct i2c_client_address_data addr_data = {
        .normal_i2c             = normal_i2c,
        .probe                  = &ignore,
        .ignore                 = &ignore,
-        .force                  = &ignore,
 };
 static struct i2c_driver i2c_driver_saa7110;
diff --git a/drivers/media/video/saa7111.c b/drivers/media/video/saa7111.c
index fcd897382fcf..f18df53d98ff 100644
--- a/drivers/media/video/saa7111.c
+++ b/drivers/media/video/saa7111.c
@@ -489,7 +489,6 @@ static struct i2c_client_address_data addr_data = {
        .normal_i2c             = normal_i2c,
        .probe                  = &ignore,
        .ignore                 = &ignore,
-        .force                  = &ignore,
 };
 static struct i2c_driver i2c_driver_saa7111;
diff --git a/drivers/media/video/saa7114.c b/drivers/media/video/saa7114.c
index 2ba997f5ef1d..e0c70f54f073 100644
--- a/drivers/media/video/saa7114.c
+++ b/drivers/media/video/saa7114.c
@@ -827,7 +827,6 @@ static struct i2c_client_address_data addr_data = {
        .normal_i2c             = normal_i2c,
        .probe                  = &ignore,
        .ignore                 = &ignore,
-        .force                  = &ignore,
 };
 static struct i2c_driver i2c_driver_saa7114;
diff --git a/drivers/media/video/saa7134/saa6752hs.c b/drivers/media/video/saa7134/saa6752hs.c
index 79d05ea1b69b..382911c6ef22 100644
--- a/drivers/media/video/saa7134/saa6752hs.c
+++ b/drivers/media/video/saa7134/saa6752hs.c
@@ -598,7 +598,7 @@ static struct i2c_driver driver = {
 static struct i2c_client client_template =
 {
-        I2C_DEVNAME("saa6752hs"),
+        .name       = "saa6752hs",
        .flags      = I2C_CLIENT_ALLOW_USE,
        .driver     = &driver,
 };
diff --git a/drivers/media/video/saa7134/saa7134-i2c.c b/drivers/media/video/saa7134/saa7134-i2c.c
index 1203b93a572c..eae6b529713f 100644
--- a/drivers/media/video/saa7134/saa7134-i2c.c
+++ b/drivers/media/video/saa7134/saa7134-i2c.c
@@ -334,7 +334,7 @@ static int attach_inform(struct i2c_client *client)
        struct tuner_setup tun_setup;
        d1printk( "%s i2c attach [addr=0x%x,client=%s]\n",
-                client->driver->name,client->addr,i2c_clientname(client));
+                 client->driver->name, client->addr, client->name);
        if (!client->driver->command)
                return 0;
@@ -370,8 +370,6 @@ static int attach_inform(struct i2c_client *client)
 }
 static struct i2c_algorithm saa7134_algo = {
-        .name          = "saa7134",
-        .id            = I2C_ALGO_SAA7134,
        .master_xfer   = saa7134_i2c_xfer,
        .algo_control  = algo_control,
        .functionality = functionality,
@@ -382,14 +380,14 @@ static struct i2c_adapter saa7134_adap_template = {
 #ifdef I2C_CLASS_TV_ANALOG
        .class         = I2C_CLASS_TV_ANALOG,
 #endif
-        I2C_DEVNAME("saa7134"),
+        .name          = "saa7134",
-        .id            = I2C_ALGO_SAA7134,
+        .id            = I2C_HW_SAA7134,
        .algo          = &saa7134_algo,
        .client_register = attach_inform,
 };
 static struct i2c_client saa7134_client_template = {
-        I2C_DEVNAME("saa7134 internal"),
+        .name   = "saa7134 internal",
 };
 /* ----------------------------------------------------------- */
diff --git a/drivers/media/video/saa7185.c b/drivers/media/video/saa7185.c
index 108e7a4a0273..e93412f4407c 100644
--- a/drivers/media/video/saa7185.c
+++ b/drivers/media/video/saa7185.c
@@ -387,7 +387,6 @@ static struct i2c_client_address_data addr_data = {
        .normal_i2c             = normal_i2c,
        .probe                  = &ignore,
        .ignore                 = &ignore,
-        .force                  = &ignore,
 };
 static struct i2c_driver i2c_driver_saa7185;
diff --git a/drivers/media/video/tda7432.c b/drivers/media/video/tda7432.c
index 7cb1fb3e66f9..255b6088ebf9 100644
--- a/drivers/media/video/tda7432.c
+++ b/drivers/media/video/tda7432.c
@@ -328,7 +328,7 @@ static int tda7432_probe(struct i2c_adapter *adap)
        if (adap->class & I2C_CLASS_TV_ANALOG)
                return i2c_probe(adap, &addr_data, tda7432_attach);
 #else
-        if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848))
+        if (adap->id == I2C_HW_B_BT848)
                return i2c_probe(adap, &addr_data, tda7432_attach);
 #endif
        return 0;
@@ -513,7 +513,7 @@ static struct i2c_driver driver = {
 static struct i2c_client client_template =
 {
-        I2C_DEVNAME("tda7432"),
+        .name       = "tda7432",
        .driver     = &driver,
 };
diff --git a/drivers/media/video/tda9840.c b/drivers/media/video/tda9840.c
index c29bdfc3244e..1794686612c6 100644
--- a/drivers/media/video/tda9840.c
+++ b/drivers/media/video/tda9840.c
@@ -205,7 +205,7 @@ static int detect(struct i2c_adapter *adapter, int address, int kind)
 static int attach(struct i2c_adapter *adapter)
 {
        /* let's see whether this is a know adapter we can attach to */
-        if (adapter->id != I2C_ALGO_SAA7146) {
+        if (adapter->id != I2C_HW_SAA7146) {
                dprintk("refusing to probe on unknown adapter [name='%s',id=0x%x]\n", adapter->name, adapter->id);
                return -ENODEV;
        }
@@ -231,7 +231,7 @@ static struct i2c_driver driver = {
 };
 static struct i2c_client client_template = {
-        I2C_DEVNAME("tda9840"),
+        .name = "tda9840",
        .driver = &driver,
 };
diff --git a/drivers/media/video/tda9875.c b/drivers/media/video/tda9875.c
index 566e1a5ca135..7e3dcdb262b0 100644
--- a/drivers/media/video/tda9875.c
+++ b/drivers/media/video/tda9875.c
@@ -262,7 +262,7 @@ static int tda9875_probe(struct i2c_adapter *adap)
        if (adap->class & I2C_CLASS_TV_ANALOG)
                return i2c_probe(adap, &addr_data, tda9875_attach);
 #else
-        if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848))
+        if (adap->id == I2C_HW_B_BT848)
                return i2c_probe(adap, &addr_data, tda9875_attach);
 #endif
        return 0;
@@ -384,7 +384,7 @@ static struct i2c_driver driver = {
 static struct i2c_client client_template =
 {
-        I2C_DEVNAME("tda9875"),
+        .name      = "tda9875",
        .driver    = &driver,
 };
diff --git a/drivers/media/video/tda9887.c b/drivers/media/video/tda9887.c
index a28a395d6dfe..d60fc562aecd 100644
--- a/drivers/media/video/tda9887.c
+++ b/drivers/media/video/tda9887.c
@@ -618,9 +618,9 @@ static int tda9887_probe(struct i2c_adapter *adap)
                return i2c_probe(adap, &addr_data, tda9887_attach);
 #else
        switch (adap->id) {
-        case I2C_ALGO_BIT | I2C_HW_B_BT848:
+        case I2C_HW_B_BT848:
-        case I2C_ALGO_BIT | I2C_HW_B_RIVA:
+        case I2C_HW_B_RIVA:
-        case I2C_ALGO_SAA7134:
+        case I2C_HW_SAA7134:
                return i2c_probe(adap, &addr_data, tda9887_attach);
                break;
        }
@@ -793,7 +793,7 @@ static struct i2c_driver driver = {
 };
 static struct i2c_client client_template =
 {
-        I2C_DEVNAME("tda9887"),
+        .name      = "tda9887",
        .flags     = I2C_CLIENT_ALLOW_USE,
        .driver    = &driver,
 };
diff --git a/drivers/media/video/tea6415c.c b/drivers/media/video/tea6415c.c
index b44db8a7b94d..ee3688348b66 100644
--- a/drivers/media/video/tea6415c.c
+++ b/drivers/media/video/tea6415c.c
@@ -86,7 +86,7 @@ static int detect(struct i2c_adapter *adapter, int address, int kind)
 static int attach(struct i2c_adapter *adapter)
 {
        /* let's see whether this is a know adapter we can attach to */
-        if (adapter->id != I2C_ALGO_SAA7146) {
+        if (adapter->id != I2C_HW_SAA7146) {
                dprintk("refusing to probe on unknown adapter [name='%s',id=0x%x]\n", adapter->name, adapter->id);
                return -ENODEV;
        }
@@ -200,7 +200,7 @@ static struct i2c_driver driver = {
 };
 static struct i2c_client client_template = {
-        I2C_DEVNAME("tea6415c"),
+        .name = "tea6415c",
        .driver = &driver,
 };
diff --git a/drivers/media/video/tea6420.c b/drivers/media/video/tea6420.c
index 48d4db7d507b..17975c19da5e 100644
--- a/drivers/media/video/tea6420.c
+++ b/drivers/media/video/tea6420.c
@@ -135,7 +135,7 @@ static int tea6420_detect(struct i2c_adapter *adapter, int address, int kind)
 static int attach(struct i2c_adapter *adapter)
 {
        /* let's see whether this is a know adapter we can attach to */
-        if (adapter->id != I2C_ALGO_SAA7146) {
+        if (adapter->id != I2C_HW_SAA7146) {
                dprintk("refusing to probe on unknown adapter [name='%s',id=0x%x]\n", adapter->name, adapter->id);
                return -ENODEV;
        }
@@ -177,7 +177,7 @@ static struct i2c_driver driver = {
 };
 static struct i2c_client client_template = {
-        I2C_DEVNAME("tea6420"),
+        .name = "tea6420",
        .driver = &driver,
 };
diff --git a/drivers/media/video/tuner-3036.c b/drivers/media/video/tuner-3036.c
index 7d825e510ffd..79203595b9c1 100644
--- a/drivers/media/video/tuner-3036.c
+++ b/drivers/media/video/tuner-3036.c
@@ -41,7 +41,6 @@ static struct i2c_client_address_data addr_data = {
        .normal_i2c     = normal_i2c,
        .probe          = &ignore,
        .ignore         = &ignore,
-        .force          = &ignore,
 };
 /* ---------------------------------------------------------------------- */
@@ -166,7 +165,7 @@ static int
 tuner_probe(struct i2c_adapter *adap)
 {
        this_adap = 0;
-        if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_LP))
+        if (adap->id == I2C_HW_B_LP)
                return i2c_probe(adap, &addr_data, tuner_attach);
        return 0;
 }
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index a155e99a263b..3b1893c2ae3b 100644
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
@@ -709,7 +709,7 @@ static struct i2c_driver driver = {
                   },
 };
 static struct i2c_client client_template = {
-        I2C_DEVNAME("(tuner unset)"),
+        .name = "(tuner unset)",
        .flags = I2C_CLIENT_ALLOW_USE,
        .driver = &driver,
 };
diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c
index f42a1efa8fcf..258724b2d6d2 100644
--- a/drivers/media/video/tvaudio.c
+++ b/drivers/media/video/tvaudio.c
@@ -162,24 +162,23 @@ static int chip_write(struct CHIPSTATE *chip, int subaddr, int val)
        unsigned char buffer[2];
        if (-1 == subaddr) {
-                dprintk("%s: chip_write: 0x%x\n",
+                dprintk("%s: chip_write: 0x%x\n", chip->c.name, val);
-                        i2c_clientname(&chip->c), val);
                chip->shadow.bytes[1] = val;
                buffer[0] = val;
                if (1 != i2c_master_send(&chip->c,buffer,1)) {
                        printk(KERN_WARNING "%s: I/O error (write 0x%x)\n",
-                               i2c_clientname(&chip->c), val);
+                               chip->c.name, val);
                        return -1;
                }
        } else {
                dprintk("%s: chip_write: reg%d=0x%x\n",
-                        i2c_clientname(&chip->c), subaddr, val);
+                        chip->c.name, subaddr, val);
                chip->shadow.bytes[subaddr+1] = val;
                buffer[0] = subaddr;
                buffer[1] = val;
                if (2 != i2c_master_send(&chip->c,buffer,2)) {
                        printk(KERN_WARNING "%s: I/O error (write reg%d=0x%x)\n",
-                               i2c_clientname(&chip->c), subaddr, val);
+                               chip->c.name, subaddr, val);
                        return -1;
                }
        }
@@ -203,11 +202,10 @@ static int chip_read(struct CHIPSTATE *chip)
        unsigned char buffer;
        if (1 != i2c_master_recv(&chip->c,&buffer,1)) {
-                printk(KERN_WARNING "%s: I/O error (read)\n",
+                printk(KERN_WARNING "%s: I/O error (read)\n", chip->c.name);
-                       i2c_clientname(&chip->c));
                return -1;
        }
-        dprintk("%s: chip_read: 0x%x\n",i2c_clientname(&chip->c),buffer);
+        dprintk("%s: chip_read: 0x%x\n", chip->c.name, buffer);
        return buffer;
 }
@@ -222,12 +220,11 @@ static int chip_read2(struct CHIPSTATE *chip, int subaddr)
        write[0] = subaddr;
        if (2 != i2c_transfer(chip->c.adapter,msgs,2)) {
-                printk(KERN_WARNING "%s: I/O error (read2)\n",
+                printk(KERN_WARNING "%s: I/O error (read2)\n", chip->c.name);
-                       i2c_clientname(&chip->c));
                return -1;
        }
        dprintk("%s: chip_read2: reg%d=0x%x\n",
-                i2c_clientname(&chip->c),subaddr,read[0]);
+                chip->c.name, subaddr, read[0]);
        return read[0];
 }
@@ -240,7 +237,7 @@ static int chip_cmd(struct CHIPSTATE *chip, char *name, audiocmd *cmd)
        /* update our shadow register set; print bytes if (debug > 0) */
        dprintk("%s: chip_cmd(%s): reg=%d, data:",
-                i2c_clientname(&chip->c),name,cmd->bytes[0]);
+                chip->c.name, name, cmd->bytes[0]);
        for (i = 1; i < cmd->count; i++) {
                dprintk(" 0x%x",cmd->bytes[i]);
                chip->shadow.bytes[i+cmd->bytes[0]] = cmd->bytes[i];
@@ -249,7 +246,7 @@ static int chip_cmd(struct CHIPSTATE *chip, char *name, audiocmd *cmd)
        /* send data to the chip */
        if (cmd->count != i2c_master_send(&chip->c,cmd->bytes,cmd->count)) {
-                printk(KERN_WARNING "%s: I/O error (%s)\n", i2c_clientname(&chip->c), name);
+                printk(KERN_WARNING "%s: I/O error (%s)\n", chip->c.name, name);
                return -1;
        }
        return 0;
@@ -274,9 +271,9 @@ static int chip_thread(void *data)
        struct CHIPSTATE *chip = data;
        struct CHIPDESC  *desc = chiplist + chip->type;
-        daemonize("%s",i2c_clientname(&chip->c));
+        daemonize("%s", chip->c.name);
        allow_signal(SIGTERM);
-        dprintk("%s: thread started\n", i2c_clientname(&chip->c));
+        dprintk("%s: thread started\n", chip->c.name);
        for (;;) {
                add_wait_queue(&chip->wq, &wait);
@@ -288,7 +285,7 @@ static int chip_thread(void *data)
                try_to_freeze();
                if (chip->done || signal_pending(current))
                        break;
-                dprintk("%s: thread wakeup\n", i2c_clientname(&chip->c));
+                dprintk("%s: thread wakeup\n", chip->c.name);
                /* don't do anything for radio or if mode != auto */
                if (chip->norm == VIDEO_MODE_RADIO || chip->mode != 0)
@@ -301,7 +298,7 @@ static int chip_thread(void *data)
                mod_timer(&chip->wt, jiffies+2*HZ);
        }
-        dprintk("%s: thread exiting\n", i2c_clientname(&chip->c));
+        dprintk("%s: thread exiting\n", chip->c.name);
        complete_and_exit(&chip->texit, 0);
        return 0;
 }
@@ -314,7 +311,7 @@ static void generic_checkmode(struct CHIPSTATE *chip)
        if (mode == chip->prevmode)
            return;
-        dprintk("%s: thread checkmode\n", i2c_clientname(&chip->c));
+        dprintk("%s: thread checkmode\n", chip->c.name);
        chip->prevmode = mode;
        if (mode & VIDEO_SOUND_STEREO)
@@ -1098,7 +1095,7 @@ static int tda8425_initialize(struct CHIPSTATE *chip)
                            /* extern   */ TDA8425_S1_CH1, /* intern */ TDA8425_S1_OFF,
                            /* off      */ TDA8425_S1_OFF, /* on     */ TDA8425_S1_CH2};
-        if (chip->c.adapter->id == (I2C_ALGO_BIT | I2C_HW_B_RIVA)) {
+        if (chip->c.adapter->id == I2C_HW_B_RIVA) {
                memcpy (desc->inputmap, inputmap, sizeof (inputmap));
        }
        return 0;
@@ -1501,7 +1498,7 @@ static int chip_attach(struct i2c_adapter *adap, int addr, int kind)
                (desc->flags & CHIP_HAS_INPUTSEL)   ? " audiomux"    : "");
        /* fill required data structures */
-        strcpy(i2c_clientname(&chip->c),desc->name);
+        strcpy(chip->c.name, desc->name);
        chip->type = desc-chiplist;
        chip->shadow.count = desc->registers+1;
        chip->prevmode = -1;
@@ -1538,7 +1535,7 @@ static int chip_attach(struct i2c_adapter *adap, int addr, int kind)
                chip->tpid = kernel_thread(chip_thread,(void *)chip,0);
                if (chip->tpid < 0)
                        printk(KERN_WARNING "%s: kernel_thread() failed\n",
-                               i2c_clientname(&chip->c));
+                               chip->c.name);
                wake_up_interruptible(&chip->wq);
        }
        return 0;
@@ -1548,16 +1545,16 @@ static int chip_probe(struct i2c_adapter *adap)
 {
        /* don't attach on saa7146 based cards,
           because dedicated drivers are used */
-        if ((adap->id & I2C_ALGO_SAA7146))
+        if (adap->id == I2C_HW_SAA7146)
                return 0;
 #ifdef I2C_CLASS_TV_ANALOG
        if (adap->class & I2C_CLASS_TV_ANALOG)
                return i2c_probe(adap, &addr_data, chip_attach);
 #else
        switch (adap->id) {
-        case I2C_ALGO_BIT | I2C_HW_B_BT848:
+        case I2C_HW_B_BT848:
-        case I2C_ALGO_BIT | I2C_HW_B_RIVA:
+        case I2C_HW_B_RIVA:
-        case I2C_ALGO_SAA7134:
+        case I2C_HW_SAA7134:
                return i2c_probe(adap, &addr_data, chip_attach);
        }
 #endif
@@ -1591,7 +1588,7 @@ static int chip_command(struct i2c_client *client,
        struct CHIPSTATE *chip = i2c_get_clientdata(client);
        struct CHIPDESC  *desc = chiplist + chip->type;
-        dprintk("%s: chip_command 0x%x\n",i2c_clientname(&chip->c),cmd);
+        dprintk("%s: chip_command 0x%x\n", chip->c.name, cmd);
        switch (cmd) {
        case AUDC_SET_INPUT:
@@ -1702,7 +1699,7 @@ static struct i2c_driver driver = {
 static struct i2c_client client_template =
 {
-        I2C_DEVNAME("(unset)"),
+        .name       = "(unset)",
        .flags      = I2C_CLIENT_ALLOW_USE,
        .driver     = &driver,
 };
diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c
index 127ec38ebd60..3c3356a01cc6 100644
--- a/drivers/media/video/tveeprom.c
+++ b/drivers/media/video/tveeprom.c
@@ -534,7 +534,7 @@ static int
 tveeprom_attach_adapter (struct i2c_adapter *adapter)
 {
        dprintk(1,"%s: id 0x%x\n",__FUNCTION__,adapter->id);
-        if (adapter->id != (I2C_ALGO_BIT | I2C_HW_B_BT848))
+        if (adapter->id != I2C_HW_B_BT848)
                return 0;
        return i2c_probe(adapter, &addr_data, tveeprom_detect_client);
 }
diff --git a/drivers/media/video/tvmixer.c b/drivers/media/video/tvmixer.c
index 51b99cdbf29e..a43301a154af 100644
--- a/drivers/media/video/tvmixer.c
+++ b/drivers/media/video/tvmixer.c
@@ -91,7 +91,7 @@ static int tvmixer_ioctl(struct inode *inode, struct file *file, unsigned int cm
        if (cmd == SOUND_MIXER_INFO) {
                mixer_info info;
                strlcpy(info.id, "tv card", sizeof(info.id));
-                strlcpy(info.name, i2c_clientname(client), sizeof(info.name));
+                strlcpy(info.name, client->name, sizeof(info.name));
                info.modify_counter = 42 /* FIXME */;
                if (copy_to_user(argp, &info, sizeof(info)))
                        return -EFAULT;
@@ -100,7 +100,7 @@ static int tvmixer_ioctl(struct inode *inode, struct file *file, unsigned int cm
        if (cmd == SOUND_OLD_MIXER_INFO) {
                _old_mixer_info info;
                strlcpy(info.id, "tv card", sizeof(info.id));
-                strlcpy(info.name, i2c_clientname(client), sizeof(info.name));
+                strlcpy(info.name, client->name, sizeof(info.name));
                if (copy_to_user(argp, &info, sizeof(info)))
                        return -EFAULT;
                return 0;
@@ -276,9 +276,9 @@ static int tvmixer_clients(struct i2c_client *client)
 #else
        /* TV card ??? */
        switch (client->adapter->id) {
-        case I2C_ALGO_BIT | I2C_HW_SMBUS_VOODOO3:
+        case I2C_HW_SMBUS_VOODOO3:
-        case I2C_ALGO_BIT | I2C_HW_B_BT848:
+        case I2C_HW_B_BT848:
-        case I2C_ALGO_BIT | I2C_HW_B_RIVA:
+        case I2C_HW_B_RIVA:
                /* ok, have a look ... */
                break;
        default:
@@ -295,7 +295,7 @@ static int tvmixer_clients(struct i2c_client *client)
                        devices[i].dev = NULL;
                        devices[i].minor = -1;
                        printk("tvmixer: %s unregistered (#1)\n",
-                               i2c_clientname(client));
+                               client->name);
                        return 0;
                }
        }
@@ -354,7 +354,7 @@ static void __exit tvmixer_cleanup_module(void)
                if (devices[i].minor != -1) {
                        unregister_sound_mixer(devices[i].minor);
                        printk("tvmixer: %s unregistered (#2)\n",
-                               i2c_clientname(devices[i].dev));
+                               devices[i].dev->name);
                }
        }
 }
diff --git a/drivers/media/video/vpx3220.c b/drivers/media/video/vpx3220.c
index 5dbd9f6bf353..4437bdebe24f 100644
--- a/drivers/media/video/vpx3220.c
+++ b/drivers/media/video/vpx3220.c
@@ -576,7 +576,6 @@ static struct i2c_client_address_data addr_data = {
        .normal_i2c             = normal_i2c,
        .probe                  = &ignore,
        .ignore                 = &ignore,
-        .force                  = &ignore,
 };
 static struct i2c_driver vpx3220_i2c_driver;
diff --git a/drivers/media/video/zoran_card.c b/drivers/media/video/zoran_card.c
index 25743085b2d5..eed2acea1779 100644
--- a/drivers/media/video/zoran_card.c
+++ b/drivers/media/video/zoran_card.c
@@ -737,7 +737,7 @@ static struct i2c_algo_bit_data zoran_i2c_bit_data_template = {
 };
 static struct i2c_adapter zoran_i2c_adapter_template = {
-        I2C_DEVNAME("zr36057"),
+        .name = "zr36057",
        .id = I2C_HW_B_ZR36067,
        .algo = NULL,
        .client_register = zoran_i2c_client_register,