| Message ID | 20240902163610.17028-1-krzysztof.kozlowski@linaro.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 9748229c90dc4974f56874a2a19e040cc86de67e |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [v2] net: alacritech: Partially revert "net: alacritech: Switch to use dev_err_probe()" | expand |
On Mon, Sep 02, 2024 at 06:36:10PM +0200, Krzysztof Kozlowski wrote: > 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> > > --- > > Changes in v2: > 1. Update commit msg (Simon). Thanks for the update, much appreciated. Reviewed-by: Simon Horman <horms@kernel.org> ...
Hello: This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Mon, 2 Sep 2024 18:36:10 +0200 you wrote: > 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. > > [...] Here is the summary with links: - [v2] net: alacritech: Partially revert "net: alacritech: Switch to use dev_err_probe()" https://git.kernel.org/netdev/net-next/c/9748229c90dc You are awesome, thank you!
diff --git a/drivers/net/ethernet/alacritech/slicoss.c b/drivers/net/ethernet/alacritech/slicoss.c index 7f0c07c20be3..f62851708d4f 100644 --- a/drivers/net/ethernet/alacritech/slicoss.c +++ b/drivers/net/ethernet/alacritech/slicoss.c @@ -1051,9 +1051,11 @@ static int slic_load_rcvseq_firmware(struct slic_device *sdev) file = (sdev->model == SLIC_MODEL_OASIS) ? SLIC_RCV_FIRMWARE_OASIS : SLIC_RCV_FIRMWARE_MOJAVE; err = request_firmware(&fw, file, &sdev->pdev->dev); - if (err) - return dev_err_probe(&sdev->pdev->dev, err, + if (err) { + dev_err(&sdev->pdev->dev, "failed to load receive sequencer firmware %s\n", file); + return err; + } /* Do an initial sanity check concerning firmware size now. A further * check follows below. */ @@ -1124,9 +1126,10 @@ static int slic_load_firmware(struct slic_device *sdev) file = (sdev->model == SLIC_MODEL_OASIS) ? SLIC_FIRMWARE_OASIS : SLIC_FIRMWARE_MOJAVE; err = request_firmware(&fw, file, &sdev->pdev->dev); - if (err) - return dev_err_probe(&sdev->pdev->dev, err, - "failed to load firmware %s\n", file); + if (err) { + dev_err(&sdev->pdev->dev, "failed to load firmware %s\n", file); + return err; + } /* Do an initial sanity check concerning firmware size now. A further * check follows below. */
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> --- Changes in v2: 1. Update commit msg (Simon). --- drivers/net/ethernet/alacritech/slicoss.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)