Эх сурвалжийг харах

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>
Matthias Brugger 10 жил өмнө
parent
commit
b75b276bea

+ 1 - 1
drivers/of/address.c

@@ -871,7 +871,7 @@ EXPORT_SYMBOL(of_iomap);
  *		return PTR_ERR(base);
  *		return PTR_ERR(base);
  */
  */
 void __iomem *of_io_request_and_map(struct device_node *np, int index,
 void __iomem *of_io_request_and_map(struct device_node *np, int index,
-					char *name)
+					const char *name)
 {
 {
 	struct resource res;
 	struct resource res;
 	void __iomem *mem;
 	void __iomem *mem;

+ 2 - 2
include/linux/of_address.h

@@ -106,7 +106,7 @@ extern int of_address_to_resource(struct device_node *dev, int index,
 				  struct resource *r);
 				  struct resource *r);
 void __iomem *of_iomap(struct device_node *node, int index);
 void __iomem *of_iomap(struct device_node *node, int index);
 void __iomem *of_io_request_and_map(struct device_node *device,
 void __iomem *of_io_request_and_map(struct device_node *device,
-					int index, char *name);
+					int index, const char *name);
 #else
 #else
 
 
 #include <linux/io.h>
 #include <linux/io.h>
@@ -123,7 +123,7 @@ static inline void __iomem *of_iomap(struct device_node *device, int index)
 }
 }
 
 
 static inline void __iomem *of_io_request_and_map(struct device_node *device,
 static inline void __iomem *of_io_request_and_map(struct device_node *device,
-					int index, char *name)
+					int index, const char *name)
 {
 {
 	return IOMEM_ERR_PTR(-EINVAL);
 	return IOMEM_ERR_PTR(-EINVAL);
 }
 }