git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.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
..
b0377b8
100644
(file)
--- a/
drivers/i2c/busses/i2c-voodoo3.c
+++ b/
drivers/i2c/busses/i2c-voodoo3.c
@@
-160,7
+160,6
@@
static struct i2c_algo_bit_data voo_i2c_bit_data = {
.getsda = bit_vooi2c_getsda,
.getscl = bit_vooi2c_getscl,
.udelay = CYCLE_DELAY,
.getsda = bit_vooi2c_getsda,
.getscl = bit_vooi2c_getscl,
.udelay = CYCLE_DELAY,
- .mdelay = CYCLE_DELAY,
.timeout = TIMEOUT
};
.timeout = TIMEOUT
};
@@
-177,7
+176,6
@@
static struct i2c_algo_bit_data voo_ddc_bit_data = {
.getsda = bit_vooddc_getsda,
.getscl = bit_vooddc_getscl,
.udelay = CYCLE_DELAY,
.getsda = bit_vooddc_getsda,
.getscl = bit_vooddc_getscl,
.udelay = CYCLE_DELAY,
- .mdelay = CYCLE_DELAY,
.timeout = TIMEOUT
};
.timeout = TIMEOUT
};
@@
-213,14
+211,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)
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)
{
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);
}
iounmap(ioaddr);
}