diff options
author | Florian Vaussard <florian.vaussard@epfl.ch> | 2012-08-31 07:02:55 -0400 |
---|---|---|
committer | Wolfram Sang <w.sang@pengutronix.de> | 2012-09-12 09:54:14 -0400 |
commit | c5d3cd6dc2dc106ca9fcc8cb6587754ee6cfc86e (patch) | |
tree | 4598b072794457a51c3451ae23feca1063ea1c67 /drivers/i2c | |
parent | 0bdfe0cb803dce699ff337c35d8e97ac355fa417 (diff) |
omap-i2c: fix incorrect log message when using a device tree
When booting using a device tree, the adapter number is dynamically
assigned after the log message is sent.
This patch modifies the log message to get a correct adapter id.
Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch>
Tested-by: Benoit Cousson <b-cousson@ti.com>
Acked-by: Shubhrajyoti D <shubhrajyoti@ti.com>
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Diffstat (limited to 'drivers/i2c')
-rw-r--r-- | drivers/i2c/busses/i2c-omap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c index b149e3236da4..c78431a4970a 100644 --- a/drivers/i2c/busses/i2c-omap.c +++ b/drivers/i2c/busses/i2c-omap.c | |||
@@ -1175,9 +1175,6 @@ omap_i2c_probe(struct platform_device *pdev) | |||
1175 | goto err_unuse_clocks; | 1175 | goto err_unuse_clocks; |
1176 | } | 1176 | } |
1177 | 1177 | ||
1178 | dev_info(dev->dev, "bus %d rev%d.%d.%d at %d kHz\n", pdev->id, | ||
1179 | dev->dtrev, dev->rev >> 4, dev->rev & 0xf, dev->speed); | ||
1180 | |||
1181 | adap = &dev->adapter; | 1178 | adap = &dev->adapter; |
1182 | i2c_set_adapdata(adap, dev); | 1179 | i2c_set_adapdata(adap, dev); |
1183 | adap->owner = THIS_MODULE; | 1180 | adap->owner = THIS_MODULE; |
@@ -1195,6 +1192,9 @@ omap_i2c_probe(struct platform_device *pdev) | |||
1195 | goto err_unuse_clocks; | 1192 | goto err_unuse_clocks; |
1196 | } | 1193 | } |
1197 | 1194 | ||
1195 | dev_info(dev->dev, "bus %d rev%d.%d.%d at %d kHz\n", adap->nr, | ||
1196 | dev->dtrev, dev->rev >> 4, dev->rev & 0xf, dev->speed); | ||
1197 | |||
1198 | of_i2c_register_devices(adap); | 1198 | of_i2c_register_devices(adap); |
1199 | 1199 | ||
1200 | pm_runtime_mark_last_busy(dev->dev); | 1200 | pm_runtime_mark_last_busy(dev->dev); |