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 kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
i2c
/
busses
/
i2c-ibm_iic.c
diff --git
a/drivers/i2c/busses/i2c-ibm_iic.c
b/drivers/i2c/busses/i2c-ibm_iic.c
index
bb88521
..
87fae93
100644
(file)
--- a/
drivers/i2c/busses/i2c-ibm_iic.c
+++ b/
drivers/i2c/busses/i2c-ibm_iic.c
@@
-627,8
+627,6
@@
static u32 iic_func(struct i2c_adapter *adap)
}
static struct i2c_algorithm iic_algo = {
}
static struct i2c_algorithm iic_algo = {
- .name = "IBM IIC algorithm",
- .id = I2C_ALGO_OCP,
.master_xfer = iic_xfer,
.functionality = iic_func
};
.master_xfer = iic_xfer,
.functionality = iic_func
};
@@
-674,13
+672,12
@@
static int __devinit iic_probe(struct ocp_device *ocp){
printk(KERN_WARNING"ibm-iic%d: missing additional data!\n",
ocp->def->index);
printk(KERN_WARNING"ibm-iic%d: missing additional data!\n",
ocp->def->index);
- if (!(dev = k
malloc(sizeof(*dev), GFP_KERNEL)))
{
+ if (!(dev = k
zalloc(sizeof(*dev), GFP_KERNEL)))
{
printk(KERN_CRIT "ibm-iic%d: failed to allocate device data\n",
ocp->def->index);
return -ENOMEM;
}
printk(KERN_CRIT "ibm-iic%d: failed to allocate device data\n",
ocp->def->index);
return -ENOMEM;
}
- memset(dev, 0, sizeof(*dev));
dev->idx = ocp->def->index;
ocp_set_drvdata(ocp, dev);
dev->idx = ocp->def->index;
ocp_set_drvdata(ocp, dev);
@@
-695,7
+692,7
@@
static int __devinit iic_probe(struct ocp_device *ocp){
dev->irq = iic_force_poll ? -1 : ocp->def->irq;
if (dev->irq >= 0){
dev->irq = iic_force_poll ? -1 : ocp->def->irq;
if (dev->irq >= 0){
- /* Disable interrupts until we finish intialization,
+ /* Disable interrupts until we finish in
i
tialization,
assumes level-sensitive IRQ setup...
*/
iic_interrupt_mode(dev, 0);
assumes level-sensitive IRQ setup...
*/
iic_interrupt_mode(dev, 0);
@@
-727,7
+724,8
@@
static int __devinit iic_probe(struct ocp_device *ocp){
adap = &dev->adap;
strcpy(adap->name, "IBM IIC");
i2c_set_adapdata(adap, dev);
adap = &dev->adap;
strcpy(adap->name, "IBM IIC");
i2c_set_adapdata(adap, dev);
- adap->id = I2C_HW_OCP | iic_algo.id;
+ adap->id = I2C_HW_OCP;
+ adap->class = I2C_CLASS_HWMON;
adap->algo = &iic_algo;
adap->client_register = NULL;
adap->client_unregister = NULL;
adap->algo = &iic_algo;
adap->client_register = NULL;
adap->client_unregister = NULL;