89 lines
3.2 KiB
Diff
89 lines
3.2 KiB
Diff
From a3555d1f5c208f0a63eafee77381f68d304a0512 Mon Sep 17 00:00:00 2001
|
|
From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
|
|
Date: Fri, 12 May 2023 17:58:37 +0100
|
|
Subject: [PATCH 12/21] net: phylink: constify fwnode arguments
|
|
|
|
Both phylink_create() and phylink_fwnode_phy_connect() do not modify
|
|
the fwnode argument that they are passed, so lets constify these.
|
|
|
|
Reviewed-by: Simon Horman <simon.horman@corigine.com>
|
|
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/phy/phylink.c | 11 ++++++-----
|
|
include/linux/phylink.h | 9 +++++----
|
|
2 files changed, 11 insertions(+), 9 deletions(-)
|
|
|
|
--- a/drivers/net/phy/phylink.c
|
|
+++ b/drivers/net/phy/phylink.c
|
|
@@ -706,7 +706,7 @@ static int phylink_validate(struct phyli
|
|
}
|
|
|
|
static int phylink_parse_fixedlink(struct phylink *pl,
|
|
- struct fwnode_handle *fwnode)
|
|
+ const struct fwnode_handle *fwnode)
|
|
{
|
|
struct fwnode_handle *fixed_node;
|
|
bool pause, asym_pause, autoneg;
|
|
@@ -817,7 +817,8 @@ static int phylink_parse_fixedlink(struc
|
|
return 0;
|
|
}
|
|
|
|
-static int phylink_parse_mode(struct phylink *pl, struct fwnode_handle *fwnode)
|
|
+static int phylink_parse_mode(struct phylink *pl,
|
|
+ const struct fwnode_handle *fwnode)
|
|
{
|
|
struct fwnode_handle *dn;
|
|
const char *managed;
|
|
@@ -1440,7 +1441,7 @@ static void phylink_fixed_poll(struct ti
|
|
static const struct sfp_upstream_ops sfp_phylink_ops;
|
|
|
|
static int phylink_register_sfp(struct phylink *pl,
|
|
- struct fwnode_handle *fwnode)
|
|
+ const struct fwnode_handle *fwnode)
|
|
{
|
|
struct sfp_bus *bus;
|
|
int ret;
|
|
@@ -1479,7 +1480,7 @@ static int phylink_register_sfp(struct p
|
|
* must use IS_ERR() to check for errors from this function.
|
|
*/
|
|
struct phylink *phylink_create(struct phylink_config *config,
|
|
- struct fwnode_handle *fwnode,
|
|
+ const struct fwnode_handle *fwnode,
|
|
phy_interface_t iface,
|
|
const struct phylink_mac_ops *mac_ops)
|
|
{
|
|
@@ -1809,7 +1810,7 @@ EXPORT_SYMBOL_GPL(phylink_of_phy_connect
|
|
* Returns 0 on success or a negative errno.
|
|
*/
|
|
int phylink_fwnode_phy_connect(struct phylink *pl,
|
|
- struct fwnode_handle *fwnode,
|
|
+ const struct fwnode_handle *fwnode,
|
|
u32 flags)
|
|
{
|
|
struct fwnode_handle *phy_fwnode;
|
|
--- a/include/linux/phylink.h
|
|
+++ b/include/linux/phylink.h
|
|
@@ -568,16 +568,17 @@ void phylink_generic_validate(struct phy
|
|
unsigned long *supported,
|
|
struct phylink_link_state *state);
|
|
|
|
-struct phylink *phylink_create(struct phylink_config *, struct fwnode_handle *,
|
|
- phy_interface_t iface,
|
|
- const struct phylink_mac_ops *mac_ops);
|
|
+struct phylink *phylink_create(struct phylink_config *,
|
|
+ const struct fwnode_handle *,
|
|
+ phy_interface_t,
|
|
+ const struct phylink_mac_ops *);
|
|
void phylink_destroy(struct phylink *);
|
|
bool phylink_expects_phy(struct phylink *pl);
|
|
|
|
int phylink_connect_phy(struct phylink *, struct phy_device *);
|
|
int phylink_of_phy_connect(struct phylink *, struct device_node *, u32 flags);
|
|
int phylink_fwnode_phy_connect(struct phylink *pl,
|
|
- struct fwnode_handle *fwnode,
|
|
+ const struct fwnode_handle *fwnode,
|
|
u32 flags);
|
|
void phylink_disconnect_phy(struct phylink *);
|
|
|