From: Florian Vaussard <florian.vaussard-p8DiymsW2f8@public.gmane.org>
To: Tony Lindgren <tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
Cc: linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
"Ben Dooks" <ben-linux-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org>,
"Wolfram Sang" <w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>,
"Benoit Cousson" <b-cousson-l0cyMroinI0@public.gmane.org>,
"Florian Vaussard"
<florian.vaussard-p8DiymsW2f8@public.gmane.org>,
"Philippe Rétornaz"
<philippe.retornaz-p8DiymsW2f8@public.gmane.org>
Subject: [PATCH] omap-i2c: fix incorrect log message when using a device tree
Date: Fri, 31 Aug 2012 13:02:55 +0200 [thread overview]
Message-ID: <1346410975-29930-1-git-send-email-florian.vaussard@epfl.ch> (raw)
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.
Applies on 3.6-rc3. Tested on OMAP3 (Gumstix Overo).
Signed-off-by: Florian Vaussard <florian.vaussard-p8DiymsW2f8@public.gmane.org>
---
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 5d19a49..136b4fe 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -1064,9 +1064,6 @@ omap_i2c_probe(struct platform_device *pdev)
goto err_unuse_clocks;
}
- dev_info(dev->dev, "bus %d rev%d.%d.%d at %d kHz\n", pdev->id,
- dev->dtrev, dev->rev >> 4, dev->rev & 0xf, dev->speed);
-
adap = &dev->adapter;
i2c_set_adapdata(adap, dev);
adap->owner = THIS_MODULE;
@@ -1084,6 +1081,9 @@ omap_i2c_probe(struct platform_device *pdev)
goto err_free_irq;
}
+ dev_info(dev->dev, "bus %d rev%d.%d.%d at %d kHz\n", adap->nr,
+ dev->dtrev, dev->rev >> 4, dev->rev & 0xf, dev->speed);
+
of_i2c_register_devices(adap);
pm_runtime_put(dev->dev);
--
1.7.5.4
next reply other threads:[~2012-08-31 11:02 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-31 11:02 Florian Vaussard [this message]
2012-08-31 12:36 ` [PATCH] omap-i2c: fix incorrect log message when using a device tree Benoit Cousson
[not found] ` <5040AFCC.5060004-l0cyMroinI0@public.gmane.org>
2012-09-11 7:01 ` Florian Vaussard
2012-09-11 9:28 ` Shubhrajyoti
[not found] ` <1346410975-29930-1-git-send-email-florian.vaussard-p8DiymsW2f8@public.gmane.org>
2012-09-12 13:55 ` Wolfram Sang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1346410975-29930-1-git-send-email-florian.vaussard@epfl.ch \
--to=florian.vaussard-p8diymsw2f8@public.gmane.org \
--cc=b-cousson-l0cyMroinI0@public.gmane.org \
--cc=ben-linux-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org \
--cc=linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=philippe.retornaz-p8DiymsW2f8@public.gmane.org \
--cc=tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org \
--cc=w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).