diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2013-08-18 13:01:30 +0200 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2013-08-28 20:50:19 +0100 |
| commit | 7e0bdf15cee7d2c809558b8169dc5b08792d0c82 (patch) | |
| tree | ce452bfafc5219963c8bd702df24b722a701153f | |
| parent | 8be137f2664f0abb096626a9d2ce0fcdd955b109 (diff) | |
| download | op-kernel-dev-7e0bdf15cee7d2c809558b8169dc5b08792d0c82.zip op-kernel-dev-7e0bdf15cee7d2c809558b8169dc5b08792d0c82.tar.gz | |
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 ea174c8..8f9be2e 100644 --- a/drivers/of/of_net.c +++ b/drivers/of/of_net.c @@ -39,7 +39,7 @@ static const char *phy_modes[] = { * The function gets phy interface string from property 'phy-mode', * 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; int err, i; diff --git a/include/linux/of_net.h b/include/linux/of_net.h index 61bf53b..34597c8 100644 --- a/include/linux/of_net.h +++ b/include/linux/of_net.h @@ -9,10 +9,10 @@ #ifdef CONFIG_OF_NET #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); #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; } |
