mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-05 19:24:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'net-remove-the-use-of-dev_err_probe'

Browse Source 
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/20250820085749.397586-1-zhao.xichao@vivo.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski
2025-08-21 15:51:46 -07:00
parent 4dba4a936f 5e91879a7a
commit a3b6b329e6
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/dsa/lantiq_gswip.c
View File

@@ -1935,8 +1935,7 @@ static int gswip_gphy_fw_load(struct gswip_priv *priv, struct gswip_gphy_fw *gph
memcpy(fw_addr, fw->data, fw->size);
} else {
release_firmware(fw);
return dev_err_probe(dev, -ENOMEM,
"failed to alloc firmware memory\n");
return -ENOMEM;
}
release_firmware(fw);

2
drivers/net/ethernet/hisilicon/hibmcge/hbg_main.c
View File

@@ -417,7 +417,7 @@ static int hbg_pci_init(struct pci_dev *pdev)
priv->io_base = pcim_iomap_table(pdev)[0];
if (!priv->io_base)
return dev_err_probe(dev, -ENOMEM, "failed to get io base\n");
return -ENOMEM;
pci_set_master(pdev);
return 0;

3
drivers/net/ethernet/hisilicon/hibmcge/hbg_mdio.c
View File

@@ -278,8 +278,7 @@ int hbg_mdio_init(struct hbg_priv *priv)
mdio_bus = devm_mdiobus_alloc(dev);
if (!mdio_bus)
return dev_err_probe(dev, -ENOMEM,
"failed to alloc MDIO bus\n");
return -ENOMEM;
mdio_bus->parent = dev;
mdio_bus->priv = priv;