kernel: copy kernel 4.19 code to 5.4
[openwrt/staging/jogo.git] / target / linux / generic / backport-5.4 / 719-v5.5-net-sfp-fix-sfp_bus_add_upstream-warning.patch
1 From f76d84cd85f8bd3f083495f7ca723822cba8abc9 Mon Sep 17 00:00:00 2001
2 From: Russell King <rmk+kernel@armlinux.org.uk>
3 Date: Mon, 11 Nov 2019 10:23:35 +0000
4 Subject: [PATCH 617/660] net: sfp: fix sfp_bus_add_upstream() warning
5
6 When building with SFP disabled, the stub for sfp_bus_add_upstream()
7 missed "inline". Add it.
8
9 Fixes: 727b3668b730 ("net: sfp: rework upstream interface")
10 Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
11 ---
12 include/linux/sfp.h | 4 ++--
13 1 file changed, 2 insertions(+), 2 deletions(-)
14
15 --- a/include/linux/sfp.h
16 +++ b/include/linux/sfp.h
17 @@ -563,8 +563,8 @@ static inline struct sfp_bus *sfp_bus_fi
18 return NULL;
19 }
20
21 -static int sfp_bus_add_upstream(struct sfp_bus *bus, void *upstream,
22 - const struct sfp_upstream_ops *ops)
23 +static inline int sfp_bus_add_upstream(struct sfp_bus *bus, void *upstream,
24 + const struct sfp_upstream_ops *ops)
25 {
26 return 0;
27 }