Ver Fonte

of: Make of_get_phy_mode() return int i.s.o. const int

include/linux/of_net.h:16: warning: type qualifiers ignored on function return type

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Grant Likely <grant.likely@linaro.org>
Geert Uytterhoeven há 12 anos atrás
pai
commit
7e0bdf15ce
2 ficheiros alterados com 3 adições e 3 exclusões
  1. 1 1
      drivers/of/of_net.c
  2. 2 2
      include/linux/of_net.h

+ 1 - 1
drivers/of/of_net.c

@@ -39,7 +39,7 @@ static const char *phy_modes[] = {
  * The function gets phy interface string from property 'phy-mode',
  * The function gets phy interface string from property 'phy-mode',
  * and return its index in phy_modes table, or errno in error case.
  * and return its index in phy_modes table, or errno in error case.
  */
  */
-const int of_get_phy_mode(struct device_node *np)
+int of_get_phy_mode(struct device_node *np)
 {
 {
 	const char *pm;
 	const char *pm;
 	int err, i;
 	int err, i;

+ 2 - 2
include/linux/of_net.h

@@ -9,10 +9,10 @@
 
 
 #ifdef CONFIG_OF_NET
 #ifdef CONFIG_OF_NET
 #include <linux/of.h>
 #include <linux/of.h>
-extern const int of_get_phy_mode(struct device_node *np);
+extern int of_get_phy_mode(struct device_node *np);
 extern const void *of_get_mac_address(struct device_node *np);
 extern const void *of_get_mac_address(struct device_node *np);
 #else
 #else
-static inline const int of_get_phy_mode(struct device_node *np)
+static inline int of_get_phy_mode(struct device_node *np)
 {
 {
 	return -ENODEV;
 	return -ENODEV;
 }
 }