From: Martin Michlmayr Update the IOP3xx I2C driver to use i2c_add_numbered_adapter(), so that later patches can convert boards to using new-style drivers. Signed-off-by: Martin Michlmayr Tested-by: Voipio Riku Cc: Dan J Williams Acked-by: Jean Delvare Signed-off-by: Andrew Morton --- drivers/i2c/busses/i2c-iop3xx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff -puN drivers/i2c/busses/i2c-iop3xx.c~i2c-iop3xx-switch-to-static-adapter-numbering drivers/i2c/busses/i2c-iop3xx.c --- a/drivers/i2c/busses/i2c-iop3xx.c~i2c-iop3xx-switch-to-static-adapter-numbering +++ a/drivers/i2c/busses/i2c-iop3xx.c @@ -491,6 +491,7 @@ iop3xx_i2c_probe(struct platform_device new_adapter->id = I2C_HW_IOP3XX; new_adapter->owner = THIS_MODULE; new_adapter->dev.parent = &pdev->dev; + new_adapter->nr = pdev->id; /* * Default values...should these come in from board code? @@ -508,7 +509,7 @@ iop3xx_i2c_probe(struct platform_device platform_set_drvdata(pdev, new_adapter); new_adapter->algo_data = adapter_data; - i2c_add_adapter(new_adapter); + i2c_add_numbered_adapter(new_adapter); return 0; _