public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

net: alacritech: Switch to use dev_err_probe()

Browse source 
use dev_err_probe() instead of dev_err() to simplify the error path and
standardize the format of the error code.

Signed-off-by: Yang Ruibin <11162571@vivo.com>
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Link: https://patch.msgid.link/20240828122650.1324246-1-11162571@vivo.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Yang Ruibin 2024-08-28 20:26:49 +08:00 • committed by Jakub Kicinski
parent 4266563afb
commit bf4d87f884
1 changed files with 14 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
drivers/net/ethernet/alacritech/slicoss.c
View file

@ -1051,11 +1051,9 @@ static int slic_load_rcvseq_firmware(struct slic_device *sdev)
file = (sdev->model == SLIC_MODEL_OASIS) ? SLIC_RCV_FIRMWARE_OASIS : file = (sdev->model == SLIC_MODEL_OASIS) ? SLIC_RCV_FIRMWARE_OASIS :
SLIC_RCV_FIRMWARE_MOJAVE; SLIC_RCV_FIRMWARE_MOJAVE;
err = request_firmware(&fw, file, &sdev->pdev->dev); err = request_firmware(&fw, file, &sdev->pdev->dev);
if (err) { if (err)
dev_err(&sdev->pdev->dev, return dev_err_probe(&sdev->pdev->dev, err,
"failed to load receive sequencer firmware %s\n", file); "failed to load receive sequencer firmware %s\n", file);
return err;
}
/* Do an initial sanity check concerning firmware size now. A further /* Do an initial sanity check concerning firmware size now. A further
* check follows below. * check follows below.
*/ */
@ -1126,10 +1124,9 @@ static int slic_load_firmware(struct slic_device *sdev)
file = (sdev->model == SLIC_MODEL_OASIS) ? SLIC_FIRMWARE_OASIS : file = (sdev->model == SLIC_MODEL_OASIS) ? SLIC_FIRMWARE_OASIS :
SLIC_FIRMWARE_MOJAVE; SLIC_FIRMWARE_MOJAVE;
err = request_firmware(&fw, file, &sdev->pdev->dev); err = request_firmware(&fw, file, &sdev->pdev->dev);
if (err) { if (err)
dev_err(&sdev->pdev->dev, "failed to load firmware %s\n", file); return dev_err_probe(&sdev->pdev->dev, err,
return err; "failed to load firmware %s\n", file);
}
/* Do an initial sanity check concerning firmware size now. A further /* Do an initial sanity check concerning firmware size now. A further
* check follows below. * check follows below.
*/ */
@ -1678,17 +1675,15 @@ static int slic_init(struct slic_device *sdev)
slic_card_reset(sdev); slic_card_reset(sdev);
err = slic_load_firmware(sdev); err = slic_load_firmware(sdev);
if (err) { if (err)
dev_err(&sdev->pdev->dev, "failed to load firmware\n"); return dev_err_probe(&sdev->pdev->dev, err,
return err; "failed to load firmware\n");
}
/* we need the shared memory to read EEPROM so set it up temporarily */ /* we need the shared memory to read EEPROM so set it up temporarily */
err = slic_init_shmem(sdev); err = slic_init_shmem(sdev);
if (err) { if (err)
dev_err(&sdev->pdev->dev, "failed to init shared memory\n"); return dev_err_probe(&sdev->pdev->dev, err,
return err; "failed to init shared memory\n");
}
err = slic_read_eeprom(sdev); err = slic_read_eeprom(sdev);
if (err) { if (err) {
@ -1741,10 +1736,9 @@ static int slic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
int err; int err;
err = pci_enable_device(pdev); err = pci_enable_device(pdev);
if (err) { if (err)
dev_err(&pdev->dev, "failed to enable PCI device\n"); return dev_err_probe(&pdev->dev, err,
return err; "failed to enable PCI device\n");
}
pci_set_master(pdev); pci_set_master(pdev);
pci_try_set_mwi(pdev); pci_try_set_mwi(pdev);