enetc: fix build warning
Subsystems (3)
PATCH v2 1/1 enetc: fix build warning
From: Arnd Bergmann <[email protected]>
When CONFIG_OF is disabled, there is a harmless warning about an unused variable:
enetc_pf.c: In function 'enetc_phylink_create':
enetc_pf.c:981:17: error: unused variable 'dev' [-Werror=unused-variable]
Slightly rearrange the code to pass around the of_node as a function argument, which avoids the problem without hurting readability.
---
v2: move added variable declaration up
--- .../net/ethernet/freescale/enetc/enetc_pf.c | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-)
drivers/net/ethernet/freescale/enetc/enetc_pf.c +10 -11
@@ -851,13 +851,12 @@ static bool enetc_port_has_pcs(struct enetc_pf *pf) pf->if_mode == PHY_INTERFACE_MODE_USXGMII); } -static int enetc_mdiobus_create (struct enetc_pf *pf) +static int enetc_mdiobus_create (struct enetc_pf *pf,struct device_node *node) { -struct device *dev = &pf->si->pdev->dev;struct device_node *mdio_np;int err; - mdio_np =of_get_child_by_name (dev->of_node,"mdio" ); + mdio_np =of_get_child_by_name (node,"mdio" );if (mdio_np) { err =enetc_mdio_probe (pf, mdio_np);
@@ -969,18 +968,17 @@ static const struct phylink_mac_ops enetc_mac_phylink_ops = { .mac_link_down = enetc_pl_mac_link_down, }; -static int enetc_phylink_create (struct enetc_ndev_priv *priv) +static int enetc_phylink_create (struct enetc_ndev_priv *priv, +struct device_node *node) {struct enetc_pf *pf =enetc_si_priv (priv->si); -struct device *dev = &pf->si->pdev->dev;struct phylink *phylink;int err; pf->phylink_config.dev = &priv->ndev->dev; pf->phylink_config.type =PHYLINK_NETDEV ; - phylink =phylink_create (&pf->phylink_config, -of_fwnode_handle (dev->of_node), + phylink =phylink_create (&pf->phylink_config,of_fwnode_handle (node), pf->if_mode, &enetc_mac_phylink_ops);if (IS_ERR (phylink)) { err =PTR_ERR (phylink);
@@ -1001,13 +999,14 @@ static void enetc_phylink_destroy(struct enetc_ndev_priv *priv)static int enetc_pf_probe (struct pci_dev *pdev,const struct pci_device_id *ent) { +struct device_node *node = pdev->dev.of_node;struct enetc_ndev_priv *priv;struct net_device *ndev;struct enetc_si *si;struct enetc_pf *pf;int err; -if (pdev->dev.of_node && !of_device_is_available (pdev->dev.of_node)) { +if (node && !of_device_is_available (node)) {dev_info (&pdev->dev,"device is disabled, skipping\n" );return -ENODEV ; }
@@ -1058,12 +1057,12 @@ static int enetc_pf_probe(struct pci_dev *pdev, goto err_alloc_msix; } -if (!of_get_phy_mode (pdev->dev.of_node, &pf->if_mode)) { - err =enetc_mdiobus_create (pf); +if (!of_get_phy_mode (node, &pf->if_mode)) { + err =enetc_mdiobus_create (pf, node);if (err) goto err_mdiobus_create; - err =enetc_phylink_create (priv); + err =enetc_phylink_create (priv, node);if (err) goto err_phylink_create; }
Signature · 1 line
2.27.0
This patch was applied to netdev/net-next.git (refs/heads/master):
Hello:
This patch was applied to netdev/net-next.git (refs/heads/master):
Quoted 9 lines · On Fri, 4 Dec 2020 20:28:59 +0100 you wrote:
From: Arnd Bergmann <[email protected]>
When
CONFIG_OFis disabled, there is a harmless warning about an unused variable:
enetc_pf.c: In function 'enetc_phylink_create':
enetc_pf.c:981:17: error: unused variable 'dev' [-Werror=unused-variable][...]
Here is the summary with links:
- [v2] enetc: fix build warning
https://git.kernel.org/netdev/net-next/c/4560b2a3ecdd
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html