From: Zhang Rui <rui.zhang@intel.com>
To: linux-kernel@vger.kernel.org, linux-i2c@vger.kernel.org,
linux-spi@vger.kernel.org
Cc: rjw@rjwysocki.net, grant.likely@secretlab.ca,
jarkko.nikula@linux.intel.com, mika.westerberg@linux.intel.com,
Zhang Rui <rui.zhang@intel.com>
Subject: [PATCH 4/4] OF: introduce OF style 'modalias' support for platform bus.
Date: Mon, 13 Jan 2014 21:48:36 +0800 [thread overview]
Message-ID: <1389620916-3923-1-git-send-email-rui.zhang@intel.com> (raw)
Fix a problem that, the platform bus supports the OF style modalias
in .uevent() call, but not in its device' "modalias" sysfs attribute.
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
---
drivers/base/platform.c | 4 ++++
drivers/of/device.c | 3 +++
include/linux/of_device.h | 6 ++++++
3 files changed, 13 insertions(+)
diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 2f4aea2..bc78848 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -679,6 +679,10 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *a,
struct platform_device *pdev = to_platform_device(dev);
int len;
+ len = of_device_get_modalias(dev, buf, PAGE_SIZE -1);
+ if (len != -ENODEV)
+ return len;
+
len = acpi_device_modalias(dev, buf, PAGE_SIZE -1);
if (len != -ENODEV)
return len;
diff --git a/drivers/of/device.c b/drivers/of/device.c
index f685e55..dafb973 100644
--- a/drivers/of/device.c
+++ b/drivers/of/device.c
@@ -85,6 +85,9 @@ ssize_t of_device_get_modalias(struct device *dev, char *str, ssize_t len)
int cplen, i;
ssize_t tsize, csize, repend;
+ if ((!dev) || (!dev->of_node))
+ return -ENODEV;
+
/* Name & Type */
csize = snprintf(str, len, "of:N%sT%s", dev->of_node->name,
dev->of_node->type);
diff --git a/include/linux/of_device.h b/include/linux/of_device.h
index 82ce324..8d7dd67 100644
--- a/include/linux/of_device.h
+++ b/include/linux/of_device.h
@@ -64,6 +64,12 @@ static inline int of_driver_match_device(struct device *dev,
static inline void of_device_uevent(struct device *dev,
struct kobj_uevent_env *env) { }
+static inline int of_device_get_modalias(struct device *dev,
+ char *str, ssize_t len)
+{
+ return -ENODEV;
+}
+
static inline int of_device_uevent_modalias(struct device *dev,
struct kobj_uevent_env *env)
{
--
1.7.9.5
next reply other threads:[~2014-01-13 13:49 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-13 13:48 Zhang Rui [this message]
2014-01-14 8:46 [PATCH 0/4] module autoloading fixes Zhang Rui
2014-01-14 8:46 ` [PATCH 4/4] OF: introduce OF style 'modalias' support for platform bus Zhang Rui
2014-01-15 13:45 ` Rob Herring
2014-01-16 1:09 ` Rafael J. Wysocki
2014-01-16 7:04 ` Zhang, Rui
2014-01-16 21:21 ` Rob Herring
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=1389620916-3923-1-git-send-email-rui.zhang@intel.com \
--to=rui.zhang@intel.com \
--cc=grant.likely@secretlab.ca \
--cc=jarkko.nikula@linux.intel.com \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=mika.westerberg@linux.intel.com \
--cc=rjw@rjwysocki.net \
/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).