Skip to content

Commit a3b6b32

Browse files
committed
Merge branch 'net-remove-the-use-of-dev_err_probe'
Xichao Zhao says: ==================== net: Remove the use of dev_err_probe() The dev_err_probe() doesn't do anything when error is '-ENOMEM'. Therefore, remove the useless call to dev_err_probe(), and just return the value instead. ==================== Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
2 parents 4dba4a9 + 5e91879 commit a3b6b32

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

drivers/net/dsa/lantiq_gswip.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1935,8 +1935,7 @@ static int gswip_gphy_fw_load(struct gswip_priv *priv, struct gswip_gphy_fw *gph
19351935
memcpy(fw_addr, fw->data, fw->size);
19361936
} else {
19371937
release_firmware(fw);
1938-
return dev_err_probe(dev, -ENOMEM,
1939-
"failed to alloc firmware memory\n");
1938+
return -ENOMEM;
19401939
}
19411940

19421941
release_firmware(fw);

drivers/net/ethernet/hisilicon/hibmcge/hbg_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ static int hbg_pci_init(struct pci_dev *pdev)
417417

418418
priv->io_base = pcim_iomap_table(pdev)[0];
419419
if (!priv->io_base)
420-
return dev_err_probe(dev, -ENOMEM, "failed to get io base\n");
420+
return -ENOMEM;
421421

422422
pci_set_master(pdev);
423423
return 0;

drivers/net/ethernet/hisilicon/hibmcge/hbg_mdio.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,8 +278,7 @@ int hbg_mdio_init(struct hbg_priv *priv)
278278

279279
mdio_bus = devm_mdiobus_alloc(dev);
280280
if (!mdio_bus)
281-
return dev_err_probe(dev, -ENOMEM,
282-
"failed to alloc MDIO bus\n");
281+
return -ENOMEM;
283282

284283
mdio_bus->parent = dev;
285284
mdio_bus->priv = priv;

0 commit comments

Comments
 (0)