summaryrefslogtreecommitdiffstats
path: root/include/linux/of_device.h
diff options
context:
space:
mode:
authorRob Herring2017-03-22 15:16:27 +0100
committerRob Herring2017-03-22 20:56:13 +0100
commit0634c2958927198797bf9e55d26fb51cce4c22b4 (patch)
treee517e4931cce3cec6323e08355d53a97b8de66b3 /include/linux/of_device.h
parentof: fix of_device_get_modalias returned length when truncating buffers (diff)
downloadkernel-qcow2-linux-0634c2958927198797bf9e55d26fb51cce4c22b4.tar.gz
kernel-qcow2-linux-0634c2958927198797bf9e55d26fb51cce4c22b4.tar.xz
kernel-qcow2-linux-0634c2958927198797bf9e55d26fb51cce4c22b4.zip
of: Add function for generating a DT modalias with a newline
The modalias sysfs attr is lacking a newline for DT aliases on platform devices. The macio and ibmebus correctly add the newline, but open code it. Introduce a new function, of_device_modalias(), that fills the buffer with the modalias including the newline and update users of the old of_device_get_modalias function. Signed-off-by: Rob Herring <robh@kernel.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Frank Rowand <frowand.list@gmail.com> Cc: linuxppc-dev@lists.ozlabs.org Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/of_device.h')
-rw-r--r--include/linux/of_device.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/include/linux/of_device.h b/include/linux/of_device.h
index c12dace043f3..169ea0bd8eb4 100644
--- a/include/linux/of_device.h
+++ b/include/linux/of_device.h
@@ -34,8 +34,7 @@ extern void of_device_unregister(struct platform_device *ofdev);
extern const void *of_device_get_match_data(const struct device *dev);
-extern ssize_t of_device_get_modalias(struct device *dev,
- char *str, ssize_t len);
+extern ssize_t of_device_modalias(struct device *dev, char *str, ssize_t len);
extern int of_device_request_module(struct device *dev);
extern void of_device_uevent(struct device *dev, struct kobj_uevent_env *env);
@@ -72,8 +71,8 @@ static inline const void *of_device_get_match_data(const struct device *dev)
return NULL;
}
-static inline int of_device_get_modalias(struct device *dev,
- char *str, ssize_t len)
+static inline int of_device_modalias(struct device *dev,
+ char *str, ssize_t len)
{
return -ENODEV;
}