diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2013-08-18 07:01:30 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@linaro.org> | 2013-08-28 15:50:19 -0400 |
commit | 7e0bdf15cee7d2c809558b8169dc5b08792d0c82 (patch) | |
tree | ce452bfafc5219963c8bd702df24b722a701153f | |
parent | 8be137f2664f0abb096626a9d2ce0fcdd955b109 (diff) |
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>
-rw-r--r-- | drivers/of/of_net.c | 2 | ||||
-rw-r--r-- | include/linux/of_net.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/of/of_net.c b/drivers/of/of_net.c index ea174c8ee34b..8f9be2e09937 100644 --- a/drivers/of/of_net.c +++ b/drivers/of/of_net.c | |||
@@ -39,7 +39,7 @@ static const char *phy_modes[] = { | |||
39 | * The function gets phy interface string from property 'phy-mode', | 39 | * The function gets phy interface string from property 'phy-mode', |
40 | * and return its index in phy_modes table, or errno in error case. | 40 | * and return its index in phy_modes table, or errno in error case. |
41 | */ | 41 | */ |
42 | const int of_get_phy_mode(struct device_node *np) | 42 | int of_get_phy_mode(struct device_node *np) |
43 | { | 43 | { |
44 | const char *pm; | 44 | const char *pm; |
45 | int err, i; | 45 | int err, i; |
diff --git a/include/linux/of_net.h b/include/linux/of_net.h index 61bf53b02779..34597c8c1a4c 100644 --- a/include/linux/of_net.h +++ b/include/linux/of_net.h | |||
@@ -9,10 +9,10 @@ | |||
9 | 9 | ||
10 | #ifdef CONFIG_OF_NET | 10 | #ifdef CONFIG_OF_NET |
11 | #include <linux/of.h> | 11 | #include <linux/of.h> |
12 | extern const int of_get_phy_mode(struct device_node *np); | 12 | extern int of_get_phy_mode(struct device_node *np); |
13 | extern const void *of_get_mac_address(struct device_node *np); | 13 | extern const void *of_get_mac_address(struct device_node *np); |
14 | #else | 14 | #else |
15 | static inline const int of_get_phy_mode(struct device_node *np) | 15 | static inline int of_get_phy_mode(struct device_node *np) |
16 | { | 16 | { |
17 | return -ENODEV; | 17 | return -ENODEV; |
18 | } | 18 | } |