]> git.itanic.dy.fi Git - linux-stable/commitdiff
net: enetc: remove of_device_is_available() handling
authorVladimir Oltean <vladimir.oltean@nxp.com>
Thu, 3 Aug 2023 13:58:58 +0000 (16:58 +0300)
committerDavid S. Miller <davem@davemloft.net>
Wed, 9 Aug 2023 08:18:31 +0000 (09:18 +0100)
Since commit 6fffbc7ae137 ("PCI: Honor firmware's device disabled
status"), this is redundant and does nothing, because enetc_pf_probe()
no longer even gets called.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/freescale/enetc/enetc_pf.c

index d52ac0b6add6e98942d48633950d6e830b58712f..e0a4cb7e3f501732ea1001fb96474dfb57590718 100644 (file)
@@ -1186,14 +1186,9 @@ static int enetc_init_port_rss_memory(struct enetc_si *si)
 
 static int enetc_pf_register_with_ierb(struct pci_dev *pdev)
 {
-       struct device_node *node = pdev->dev.of_node;
        struct platform_device *ierb_pdev;
        struct device_node *ierb_node;
 
-       /* Don't register with the IERB if the PF itself is disabled */
-       if (!node || !of_device_is_available(node))
-               return 0;
-
        ierb_node = of_find_compatible_node(NULL, NULL,
                                            "fsl,ls1028a-enetc-ierb");
        if (!ierb_node || !of_device_is_available(ierb_node))
@@ -1285,12 +1280,6 @@ static int enetc_pf_probe(struct pci_dev *pdev,
                goto err_psi_create;
        }
 
-       if (node && !of_device_is_available(node)) {
-               dev_info(&pdev->dev, "device is disabled, skipping\n");
-               err = -ENODEV;
-               goto err_device_disabled;
-       }
-
        pf = enetc_si_priv(si);
        pf->si = si;
        pf->total_vfs = pci_sriov_get_totalvfs(pdev);
@@ -1370,7 +1359,6 @@ static int enetc_pf_probe(struct pci_dev *pdev,
        si->ndev = NULL;
        free_netdev(ndev);
 err_alloc_netdev:
-err_device_disabled:
 err_setup_mac_addresses:
        enetc_psi_destroy(pdev);
 err_psi_create: