aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2019-11-12 11:35:00 +0000
committerDavid S. Miller <davem@davemloft.net>2019-11-12 11:13:41 -0800
commit6c0867022352027409f5a9fee1d3c6923f9e083e (patch)
tree86be01193c0a5270b1225b59eaf146ab1b1a4d4f
parentcxgb4: make function 'cxgb4_mqprio_free_hw_resources' static (diff)
downloadlinux-dev-6c0867022352027409f5a9fee1d3c6923f9e083e.tar.xz
linux-dev-6c0867022352027409f5a9fee1d3c6923f9e083e.zip
net: sfp: fix sfp_bus_add_upstream() warning
When building with SFP disabled, the stub for sfp_bus_add_upstream() missed "inline". Add it. Fixes: 727b3668b730 ("net: sfp: rework upstream interface") Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/linux/sfp.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/sfp.h b/include/linux/sfp.h
index c8464de7cff5..3b35efd85bb1 100644
--- a/include/linux/sfp.h
+++ b/include/linux/sfp.h
@@ -563,8 +563,8 @@ static inline struct sfp_bus *sfp_bus_find_fwnode(struct fwnode_handle *fwnode)
return NULL;
}
-static int sfp_bus_add_upstream(struct sfp_bus *bus, void *upstream,
- const struct sfp_upstream_ops *ops)
+static inline int sfp_bus_add_upstream(struct sfp_bus *bus, void *upstream,
+ const struct sfp_upstream_ops *ops)
{
return 0;
}