> -----Original Message----- > From: Rob Herring [mailto:robherring2@xxxxxxxxx] > Sent: Wednesday, January 15, 2014 9:45 PM > To: Zhang, Rui > Cc: linux-kernel@xxxxxxxxxxxxxxx; linux-acpi@xxxxxxxxxxxxxxx; linux- > i2c@xxxxxxxxxxxxxxx; linux-spi@xxxxxxxxxxxxxxx; wsa@xxxxxxxxxxxxx; Mark > Brown; Greg Kroah-Hartman; Wysocki, Rafael J; Grant Likely; Rob Herring; > jarkko.nikula@xxxxxxxxxxxxxxx; mika.westerberg@xxxxxxxxxxxxxxx; > devicetree@xxxxxxxxxxxxxxx > Subject: Re: [PATCH 4/4] OF: introduce OF style 'modalias' support for > platform bus. > Importance: High > > On Tue, Jan 14, 2014 at 2:46 AM, Zhang Rui <rui.zhang@xxxxxxxxx> 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@xxxxxxxxxxxxxxx > > Signed-off-by: Zhang Rui <rui.zhang@xxxxxxxxx> > > Acked-by: Rob Herring <robh@xxxxxxxxxx> > > As there doesn't appear any dependency with the rest of this series, I > can take this. > Thanks. -rui > 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@xxxxxxxxxxxxxxx More majordomo > > info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
