i2c-pasemi: use i2c_add_numbered_adapter()
Use numbered adapter registration to always have the same hardware bus show up at the same number. PWRficient 1682M has three buses, they are all on the same PCI device but different functions. So do the simple thing and register them based on function number. Future products, if having a different number of busses, are expected to have similar behaviour w.r.t. device/function layout. Signed-off-by: Olof Johansson <olof@lixom.net> Signed-off-by: Jean Delvare <khali@linux-fr.org>
This commit is contained in:
parent
541b6a7a69
commit
ccf60d8571
1 changed files with 2 additions and 1 deletions
|
@ -368,6 +368,7 @@ static int __devinit pasemi_smb_probe(struct pci_dev *dev,
|
||||||
smbus->adapter.class = I2C_CLASS_HWMON;
|
smbus->adapter.class = I2C_CLASS_HWMON;
|
||||||
smbus->adapter.algo = &smbus_algorithm;
|
smbus->adapter.algo = &smbus_algorithm;
|
||||||
smbus->adapter.algo_data = smbus;
|
smbus->adapter.algo_data = smbus;
|
||||||
|
smbus->adapter.nr = PCI_FUNC(dev->devfn);
|
||||||
|
|
||||||
/* set up the sysfs linkage to our parent device */
|
/* set up the sysfs linkage to our parent device */
|
||||||
smbus->adapter.dev.parent = &dev->dev;
|
smbus->adapter.dev.parent = &dev->dev;
|
||||||
|
@ -375,7 +376,7 @@ static int __devinit pasemi_smb_probe(struct pci_dev *dev,
|
||||||
reg_write(smbus, REG_CTL, (CTL_MTR | CTL_MRR |
|
reg_write(smbus, REG_CTL, (CTL_MTR | CTL_MRR |
|
||||||
(CLK_100K_DIV & CTL_CLK_M)));
|
(CLK_100K_DIV & CTL_CLK_M)));
|
||||||
|
|
||||||
error = i2c_add_adapter(&smbus->adapter);
|
error = i2c_add_numbered_adapter(&smbus->adapter);
|
||||||
if (error)
|
if (error)
|
||||||
goto out_release_region;
|
goto out_release_region;
|
||||||
|
|
||||||
|
|
Reference in a new issue