i2c: Allow i2c_add_numbered_adapter() to assign a bus id

Currently, if an i2c bus driver supports both static and dynamic bus
ids, it needs to choose between calling i2c_add_numbered_adapter() and
i2c_add_adapter().  This patch makes i2c_add_numbered_adapter()
redirect to i2c_add_adapter() if the requested bus id is -1.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Jean Delvare <khali@linux-fr.org>

1 files changed, 2 insertions, 5 deletions

diff --git a/drivers/i2c/busses/i2c-cpm.c b/drivers/i2c/busses/i2c-cpm.c
index 3a20961bef1e..b1d9cd28d8da 100644
--- a/drivers/i2c/busses/i2c-cpm.c
+++ b/drivers/i2c/busses/i2c-cpm.c
@@ -662,11 +662,8 @@ static int __devinit cpm_i2c_probe(struct platform_device *ofdev)
         /* register new adapter to i2c module... */
 
         data = of_get_property(ofdev->dev.of_node, "linux,i2c-index", &len);
-        if (data && len == 4) {
-                cpm->adap.nr = *data;
-                result = i2c_add_numbered_adapter(&cpm->adap);
-        } else
-                result = i2c_add_adapter(&cpm->adap);
+        cpm->adap.nr = (data && len == 4) ? be32_to_cpup(data) : -1;
+        result = i2c_add_numbered_adapter(&cpm->adap);
 
         if (result < 0) {
                 dev_err(&ofdev->dev, "Unable to register with I2C\n");