diff options
| author | Ingo Molnar <mingo@kernel.org> | 2020-07-26 19:52:16 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-07-26 19:52:30 +0200 |
| commit | 2d65685a4a6ff6ef6bfe42717222db92c04224c2 (patch) | |
| tree | 894aebbf77ce53375e999cd5c6bb34ee5d28bb9f /drivers/net/dsa/microchip/ksz_common.c | |
| parent | de0038bfaf53af0e8bc4961b7aacdcb79f43bf08 (diff) | |
| parent | fbe0d451bcea569fc0ed3455511a90646c8a9c81 (diff) | |
| download | lwn-2d65685a4a6ff6ef6bfe42717222db92c04224c2.tar.gz lwn-2d65685a4a6ff6ef6bfe42717222db92c04224c2.zip | |
Merge branch 'x86/urgent' into x86/cleanups
Refresh the branch for a dependent commit.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/dsa/microchip/ksz_common.c')
| -rw-r--r-- | drivers/net/dsa/microchip/ksz_common.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c index fd1d6676ae4f..7b6c0dce7536 100644 --- a/drivers/net/dsa/microchip/ksz_common.c +++ b/drivers/net/dsa/microchip/ksz_common.c @@ -358,8 +358,6 @@ int ksz_enable_port(struct dsa_switch *ds, int port, struct phy_device *phy) /* setup slave port */ dev->dev_ops->port_setup(dev, port, false); - if (dev->dev_ops->phy_setup) - dev->dev_ops->phy_setup(dev, port, phy); /* port_stp_state_set() will be called after to enable the port so * there is no need to do anything. |