i2c-algo-pcf: Drop unused struct members

[pandora-kernel.git] / drivers / i2c / busses / i2c-voodoo3.c

diff --git a/drivers/i2c/busses/i2c-voodoo3.c b/drivers/i2c/busses/i2c-voodoo3.c
index b675773..88a3447 100644 (file)
--- a/drivers/i2c/busses/i2c-voodoo3.c
+++ b/drivers/i2c/busses/i2c-voodoo3.c
@@ -160,12 +160,12 @@ static struct i2c_algo_bit_data voo_i2c_bit_data = {
        .getsda         = bit_vooi2c_getsda,
        .getscl         = bit_vooi2c_getscl,
        .udelay         = CYCLE_DELAY,
-       .mdelay         = CYCLE_DELAY,
        .timeout        = TIMEOUT
 };
 
 static struct i2c_adapter voodoo3_i2c_adapter = {
        .owner          = THIS_MODULE,
+       .id             = I2C_HW_B_VOO,
        .class          = I2C_CLASS_TV_ANALOG, 
        .name           = "I2C Voodoo3/Banshee adapter",
        .algo_data      = &voo_i2c_bit_data,
@@ -177,12 +177,12 @@ static struct i2c_algo_bit_data voo_ddc_bit_data = {
        .getsda         = bit_vooddc_getsda,
        .getscl         = bit_vooddc_getscl,
        .udelay         = CYCLE_DELAY,
-       .mdelay         = CYCLE_DELAY,
        .timeout        = TIMEOUT
 };
 
 static struct i2c_adapter voodoo3_ddc_adapter = {
        .owner          = THIS_MODULE,
+       .id             = I2C_HW_B_VOO,
        .class          = I2C_CLASS_DDC, 
        .name           = "DDC Voodoo3/Banshee adapter",
        .algo_data      = &voo_ddc_bit_data,
@@ -213,14 +213,14 @@ static int __devinit voodoo3_probe(struct pci_dev *dev, const struct pci_device_
                return retval;
        retval = i2c_bit_add_bus(&voodoo3_ddc_adapter);
        if (retval)
-               i2c_bit_del_bus(&voodoo3_i2c_adapter);
+               i2c_del_adapter(&voodoo3_i2c_adapter);
        return retval;
 }
 
 static void __devexit voodoo3_remove(struct pci_dev *dev)
 {
-       i2c_bit_del_bus(&voodoo3_i2c_adapter);
-       i2c_bit_del_bus(&voodoo3_ddc_adapter);
+       i2c_del_adapter(&voodoo3_i2c_adapter);
+       i2c_del_adapter(&voodoo3_ddc_adapter);
        iounmap(ioaddr);
 }