Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net: alacritech: Switch to use dev_err_probe()

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>

authored by

Yang Ruibin and committed by
Jakub Kicinski
bf4d87f8 4266563a

+14 -20
+14 -20
drivers/net/ethernet/alacritech/slicoss.c
··· 1051 1051 file = (sdev->model == SLIC_MODEL_OASIS) ? SLIC_RCV_FIRMWARE_OASIS : 1052 1052 SLIC_RCV_FIRMWARE_MOJAVE; 1053 1053 err = request_firmware(&fw, file, &sdev->pdev->dev); 1054 - if (err) { 1055 - dev_err(&sdev->pdev->dev, 1054 + if (err) 1055 + return dev_err_probe(&sdev->pdev->dev, err, 1056 1056 "failed to load receive sequencer firmware %s\n", file); 1057 - return err; 1058 - } 1059 1057 /* Do an initial sanity check concerning firmware size now. A further 1060 1058 * check follows below. 1061 1059 */ ··· 1124 1126 file = (sdev->model == SLIC_MODEL_OASIS) ? SLIC_FIRMWARE_OASIS : 1125 1127 SLIC_FIRMWARE_MOJAVE; 1126 1128 err = request_firmware(&fw, file, &sdev->pdev->dev); 1127 - if (err) { 1128 - dev_err(&sdev->pdev->dev, "failed to load firmware %s\n", file); 1129 - return err; 1130 - } 1129 + if (err) 1130 + return dev_err_probe(&sdev->pdev->dev, err, 1131 + "failed to load firmware %s\n", file); 1131 1132 /* Do an initial sanity check concerning firmware size now. A further 1132 1133 * check follows below. 1133 1134 */ ··· 1675 1678 slic_card_reset(sdev); 1676 1679 1677 1680 err = slic_load_firmware(sdev); 1678 - if (err) { 1679 - dev_err(&sdev->pdev->dev, "failed to load firmware\n"); 1680 - return err; 1681 - } 1681 + if (err) 1682 + return dev_err_probe(&sdev->pdev->dev, err, 1683 + "failed to load firmware\n"); 1682 1684 1683 1685 /* we need the shared memory to read EEPROM so set it up temporarily */ 1684 1686 err = slic_init_shmem(sdev); 1685 - if (err) { 1686 - dev_err(&sdev->pdev->dev, "failed to init shared memory\n"); 1687 - return err; 1688 - } 1687 + if (err) 1688 + return dev_err_probe(&sdev->pdev->dev, err, 1689 + "failed to init shared memory\n"); 1689 1690 1690 1691 err = slic_read_eeprom(sdev); 1691 1692 if (err) { ··· 1736 1741 int err; 1737 1742 1738 1743 err = pci_enable_device(pdev); 1739 - if (err) { 1740 - dev_err(&pdev->dev, "failed to enable PCI device\n"); 1741 - return err; 1742 - } 1744 + if (err) 1745 + return dev_err_probe(&pdev->dev, err, 1746 + "failed to enable PCI device\n"); 1743 1747 1744 1748 pci_set_master(pdev); 1745 1749 pci_try_set_mwi(pdev);