diff options
author | Matthias Brugger <matthias.bgg@gmail.com> | 2014-10-21 12:27:25 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@linaro.org> | 2014-11-04 11:43:08 -0500 |
commit | b75b276bead4850c86e60747babe09be5c13d4d1 (patch) | |
tree | c1aa6d922d03d67870238552251d2ce214cd150b | |
parent | 19fd74879a32fb10357e0cda9c8050f01bb3eeb8 (diff) |
of: Request and map make argument name constant
This patch makes the name argument from of_io_request_and_map constant.
Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
Signed-off-by: Grant Likely <grant.likely@linaro.org>
-rw-r--r-- | drivers/of/address.c | 2 | ||||
-rw-r--r-- | include/linux/of_address.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/of/address.c b/drivers/of/address.c index afdb78299f61..e02828fa3acd 100644 --- a/drivers/of/address.c +++ b/drivers/of/address.c | |||
@@ -871,7 +871,7 @@ EXPORT_SYMBOL(of_iomap); | |||
871 | * return PTR_ERR(base); | 871 | * return PTR_ERR(base); |
872 | */ | 872 | */ |
873 | void __iomem *of_io_request_and_map(struct device_node *np, int index, | 873 | void __iomem *of_io_request_and_map(struct device_node *np, int index, |
874 | char *name) | 874 | const char *name) |
875 | { | 875 | { |
876 | struct resource res; | 876 | struct resource res; |
877 | void __iomem *mem; | 877 | void __iomem *mem; |
diff --git a/include/linux/of_address.h b/include/linux/of_address.h index 8cb14eb393d6..d88e81be6368 100644 --- a/include/linux/of_address.h +++ b/include/linux/of_address.h | |||
@@ -106,7 +106,7 @@ extern int of_address_to_resource(struct device_node *dev, int index, | |||
106 | struct resource *r); | 106 | struct resource *r); |
107 | void __iomem *of_iomap(struct device_node *node, int index); | 107 | void __iomem *of_iomap(struct device_node *node, int index); |
108 | void __iomem *of_io_request_and_map(struct device_node *device, | 108 | void __iomem *of_io_request_and_map(struct device_node *device, |
109 | int index, char *name); | 109 | int index, const char *name); |
110 | #else | 110 | #else |
111 | 111 | ||
112 | #include <linux/io.h> | 112 | #include <linux/io.h> |
@@ -123,7 +123,7 @@ static inline void __iomem *of_iomap(struct device_node *device, int index) | |||
123 | } | 123 | } |
124 | 124 | ||
125 | static inline void __iomem *of_io_request_and_map(struct device_node *device, | 125 | static inline void __iomem *of_io_request_and_map(struct device_node *device, |
126 | int index, char *name) | 126 | int index, const char *name) |
127 | { | 127 | { |
128 | return IOMEM_ERR_PTR(-EINVAL); | 128 | return IOMEM_ERR_PTR(-EINVAL); |
129 | } | 129 | } |