From: Olof Johansson <olof@lixom.net>
To: Matthew Garrett <matthew.garrett@nebula.com>
Cc: torvalds@linux-foundation.org,
platform-driver-x86@vger.kernel.org,
linux-kernel@vger.kernel.org, bleung@chromium.org,
dirk@hohndel.org, Olof Johansson <olof@lixom.net>
Subject: [PATCH] Platform: x86: chromeos_laptop: defer probing if no i2c busses found
Date: Thu, 18 Apr 2013 14:55:30 -0700 [thread overview]
Message-ID: <1366322130-19364-1-git-send-email-olof@lixom.net> (raw)
If chromeos_laptop is loaded before the DRM driver, the i2c busses will
not yet be available. Defer probe for that case and try again later.
Trickling the error up to the module init function is unfortuantely a
little awkward, since the i2c bus lookup and device registration happens
as a dmi callback.
Reported-by: Dirk Hohndel <dirk@hohndel.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
---
drivers/platform/x86/chromeos_laptop.c | 33 ++++++++++++++++++++++++--------
1 file changed, 25 insertions(+), 8 deletions(-)
diff --git a/drivers/platform/x86/chromeos_laptop.c b/drivers/platform/x86/chromeos_laptop.c
index 3e5b4497..7ff12fa 100644
--- a/drivers/platform/x86/chromeos_laptop.c
+++ b/drivers/platform/x86/chromeos_laptop.c
@@ -39,6 +39,7 @@
static struct i2c_client *als;
static struct i2c_client *tp;
static struct i2c_client *ts;
+static int setup_error;
const char *i2c_adapter_names[] = {
"SMBus I801 adapter",
@@ -191,7 +192,8 @@ static int __init find_i2c_adapter_num(enum i2c_adapter_type type)
if (!dev) {
pr_err("%s: i2c adapter %s not found on system.\n", __func__,
name);
+ setup_error = -EPROBE_DEFER;
return -ENODEV;
}
adapter = to_i2c_adapter(dev);
return adapter->nr;
@@ -381,23 +383,38 @@ static struct dmi_system_id __initdata chromeos_laptop_dmi_table[] = {
};
MODULE_DEVICE_TABLE(dmi, chromeos_laptop_dmi_table);
+static void chromeos_laptop_unregister(void)
+{
+ if (als)
+ i2c_unregister_device(als);
+ if (tp)
+ i2c_unregister_device(tp);
+ if (ts)
+ i2c_unregister_device(ts);
+
+ als = NULL;
+ tp = NULL;
+ ts = NULL;
+}
+
static int __init chromeos_laptop_init(void)
{
+ setup_error = 0;
+
if (!dmi_check_system(chromeos_laptop_dmi_table)) {
pr_debug("%s unsupported system.\n", __func__);
return -ENODEV;
}
- return 0;
+
+ if (setup_error)
+ chromeos_laptop_unregister();
+
+ return setup_error;
}
static void __exit chromeos_laptop_exit(void)
{
- if (als)
- i2c_unregister_device(als);
- if (tp)
- i2c_unregister_device(tp);
- if (ts)
- i2c_unregister_device(ts);
+ chromeos_laptop_unregister();
}
module_init(chromeos_laptop_init);
--
1.7.10.4
next reply other threads:[~2013-04-18 21:55 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-18 21:55 Olof Johansson [this message]
2013-04-18 22:00 ` Benson Leung
2013-04-18 22:05 ` Olof Johansson
2013-04-18 22:44 ` Olof Johansson
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=1366322130-19364-1-git-send-email-olof@lixom.net \
--to=olof@lixom.net \
--cc=bleung@chromium.org \
--cc=dirk@hohndel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=matthew.garrett@nebula.com \
--cc=platform-driver-x86@vger.kernel.org \
--cc=torvalds@linux-foundation.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
all inboxes | Powered by JetHome®