From: Rob Herring <robherring2@gmail.com>
To: Zhang Rui <rui.zhang@intel.com>
Cc: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
linux-acpi@vger.kernel.org, linux-i2c@vger.kernel.org,
linux-spi@vger.kernel.org, wsa@the-dreams.de,
Mark Brown <broonie@linaro.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
rafael.j.wysocki@intel.com,
Grant Likely <grant.likely@linaro.org>,
Rob Herring <rob.herring@calxeda.com>,
jarkko.nikula@linux.intel.com, mika.westerberg@linux.intel.com,
"devicetree@vger.kernel.org" <devicetree@vger.kernel.org>
Subject: Re: [PATCH 4/4] OF: introduce OF style 'modalias' support for platform bus.
Date: Wed, 15 Jan 2014 07:45:18 -0600 [thread overview]
Message-ID: <CAL_JsqJFRQ+27N_9AwZXpx4V=g8HKn84WdVKtQ_Br_8SQTXY7g@mail.gmail.com> (raw)
In-Reply-To: <1389689198-2641-5-git-send-email-rui.zhang@intel.com>
On Tue, Jan 14, 2014 at 2:46 AM, Zhang Rui <rui.zhang@intel.com> wrote:
> Fix a problem that, the platform bus supports the OF style modalias
> in .uevent() call, but not in its device 'modalias' sysfs attribute.
>
> cc: devicetree@vger.kernel.org
> Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Acked-by: Rob Herring <robh@kernel.org>
As there doesn't appear any dependency with the rest of this series, I
can take this.
One minor nit below.
> ---
> 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))\
Don't need the parentheses here.
> + 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
>
> --
> To unsubscribe from this list: send the line "unsubscribe devicetree" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2014-01-15 13:45 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-14 8:46 [PATCH 0/4] module autoloading fixes Zhang Rui
2014-01-14 8:46 ` [PATCH 1/4] ACPI: fix create_modalias() return value handling Zhang Rui
2014-01-15 15:02 ` Mika Westerberg
2014-01-14 8:46 ` [PATCH 2/4] ACPI: add module autoloading support for ACPI enumerated devices Zhang Rui
2014-01-14 8:46 ` [PATCH 3/4] fix module autoloading " Zhang Rui
2014-01-15 15:08 ` Mika Westerberg
2014-01-16 8:04 ` Zhang Rui
2014-01-17 1:28 ` Rafael J. Wysocki
2014-01-17 1:56 ` Zhang Rui
2014-01-16 12:27 ` Wolfram Sang
2014-01-16 13:05 ` Zhang Rui
2014-01-16 19:46 ` Mark Brown
2014-01-17 7:37 ` Jarkko Nikula
2014-01-17 15:57 ` Mark Brown
2014-01-20 7:10 ` Jarkko Nikula
2014-01-16 12:28 ` Mark Brown
2014-01-16 12:51 ` Zhang Rui
2014-01-16 19:24 ` Wolfram Sang
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 [this message]
2014-01-16 1:09 ` Rafael J. Wysocki
2014-01-16 7:04 ` Zhang, Rui
2014-01-16 21:21 ` Rob Herring
-- strict thread matches above, loose matches on Subject: below --
2014-01-13 13:48 Zhang Rui
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='CAL_JsqJFRQ+27N_9AwZXpx4V=g8HKn84WdVKtQ_Br_8SQTXY7g@mail.gmail.com' \
--to=robherring2@gmail.com \
--cc=broonie@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=grant.likely@linaro.org \
--cc=gregkh@linuxfoundation.org \
--cc=jarkko.nikula@linux.intel.com \
--cc=linux-acpi@vger.kernel.org \
--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=rafael.j.wysocki@intel.com \
--cc=rob.herring@calxeda.com \
--cc=rui.zhang@intel.com \
--cc=wsa@the-dreams.de \
/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).