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

net: alacritech: Partially revert "net: alacritech: Switch to use dev_err_probe()"

This reverts commit bf4d87f884fe8a4b6b61fe4d0e05f293d08df61c because it
introduced dev_err_probe() in non-probe path, which is not desired.

In general, calling dev_err_probe() after successful probe in case of
handling -EPROBE_DEFER error, will set deferred status on the device
already probed. This is however not a problem here now, because
dev_err_probe() in affected places is used for handling errors from
request_firmware(), which does not return -EPROBE_DEFER. Still usage of
dev_err_probe() in such case is not correct, because request_firmware()
could once return -EPROBE_DEFER.

Fixes: bf4d87f884fe ("net: alacritech: Switch to use dev_err_probe()")
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20240902163610.17028-1-krzysztof.kozlowski@linaro.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

authored by

Krzysztof Kozlowski and committed by
Jakub Kicinski
9748229c d2088ca8

+8 -5
+8 -5
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 - return dev_err_probe(&sdev->pdev->dev, err, 1054 + if (err) { 1055 + dev_err(&sdev->pdev->dev, 1056 1056 "failed to load receive sequencer firmware %s\n", file); 1057 + return err; 1058 + } 1057 1059 /* Do an initial sanity check concerning firmware size now. A further 1058 1060 * check follows below. 1059 1061 */ ··· 1126 1124 file = (sdev->model == SLIC_MODEL_OASIS) ? SLIC_FIRMWARE_OASIS : 1127 1125 SLIC_FIRMWARE_MOJAVE; 1128 1126 err = request_firmware(&fw, file, &sdev->pdev->dev); 1129 - if (err) 1130 - return dev_err_probe(&sdev->pdev->dev, err, 1131 - "failed to load firmware %s\n", file); 1127 + if (err) { 1128 + dev_err(&sdev->pdev->dev, "failed to load firmware %s\n", file); 1129 + return err; 1130 + } 1132 1131 /* Do an initial sanity check concerning firmware size now. A further 1133 1132 * check follows below. 1134 1133 */